[vlc-commits] v4l2: cleanup headers order

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 15 18:28:29 2012 +0200| [bda8acb3a7818ebf1094ffd1a427dc1ea86cf040] | committer: Rémi Denis-Courmont

v4l2: cleanup headers order

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bda8acb3a7818ebf1094ffd1a427dc1ea86cf040
---

 modules/access/v4l2/access.c   |    5 +++--
 modules/access/v4l2/controls.c |    5 ++++-
 modules/access/v4l2/demux.c    |    4 +++-
 modules/access/v4l2/lib.c      |    3 +++
 modules/access/v4l2/v4l2.h     |    2 --
 modules/access/v4l2/video.c    |   10 ++++++----
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c
index e0c9c68..7c08b01 100644
--- a/modules/access/v4l2/access.c
+++ b/modules/access/v4l2/access.c
@@ -27,15 +27,16 @@
 # include "config.h"
 #endif
 
-#include "v4l2.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 
+#include <vlc_common.h>
 #include <vlc_access.h>
 #include <vlc_fs.h>
 
+#include "v4l2.h"
+
 static block_t *AccessRead( access_t * );
 static ssize_t AccessReadStream( access_t *, uint8_t *, size_t );
 static int AccessControl( access_t *, int, va_list );
diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index 9c02263..a6f6333 100644
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -27,11 +27,14 @@
 # include "config.h"
 #endif
 
-#include "v4l2.h"
 #include <ctype.h>
 #include <assert.h>
 #include <sys/ioctl.h>
 
+#include <vlc_common.h>
+
+#include "v4l2.h"
+
 typedef struct vlc_v4l2_ctrl_name
 {
     const char name[28];
diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
index 71387fd..8475fbc 100644
--- a/modules/access/v4l2/demux.c
+++ b/modules/access/v4l2/demux.c
@@ -27,16 +27,18 @@
 # include "config.h"
 #endif
 
-#include "v4l2.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <poll.h>
 
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_fs.h>
 
+#include "v4l2.h"
+
 static int DemuxControl( demux_t *, int, va_list );
 static int Demux( demux_t * );
 
diff --git a/modules/access/v4l2/lib.c b/modules/access/v4l2/lib.c
index 6bd3dfe..3c662aa 100644
--- a/modules/access/v4l2/lib.c
+++ b/modules/access/v4l2/lib.c
@@ -27,6 +27,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+
+#include <vlc_common.h>
+
 #include "v4l2.h"
 
 static void *v4l2_handle = NULL;
diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index 903a348..74096b3 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -18,8 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_common.h>
-
 #if defined(HAVE_LINUX_VIDEODEV2_H)
 #   include <linux/videodev2.h>
 #elif defined(HAVE_SYS_VIDEOIO_H)
diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 83437a6..2bccf59 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -37,10 +37,6 @@
 # include "config.h"
 #endif
 
-#include "v4l2.h"
-#include <vlc_plugin.h>
-#include <vlc_demux.h>
-
 #include <math.h>
 #include <assert.h>
 #include <errno.h>
@@ -48,6 +44,12 @@
 #include <sys/mman.h>
 #include <poll.h>
 
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+
+#include "v4l2.h"
+
 /*****************************************************************************
  * Module descriptior
  *****************************************************************************/