Commit bda8acb3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

v4l2: cleanup headers order

parent 77cd4230
...@@ -27,15 +27,16 @@ ...@@ -27,15 +27,16 @@
# include "config.h" # include "config.h"
#endif #endif
#include "v4l2.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#include <vlc_common.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_fs.h> #include <vlc_fs.h>
#include "v4l2.h"
static block_t *AccessRead( access_t * ); static block_t *AccessRead( access_t * );
static ssize_t AccessReadStream( access_t *, uint8_t *, size_t ); static ssize_t AccessReadStream( access_t *, uint8_t *, size_t );
static int AccessControl( access_t *, int, va_list ); static int AccessControl( access_t *, int, va_list );
......
...@@ -27,11 +27,14 @@ ...@@ -27,11 +27,14 @@
# include "config.h" # include "config.h"
#endif #endif
#include "v4l2.h"
#include <ctype.h> #include <ctype.h>
#include <assert.h> #include <assert.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <vlc_common.h>
#include "v4l2.h"
typedef struct vlc_v4l2_ctrl_name typedef struct vlc_v4l2_ctrl_name
{ {
const char name[28]; const char name[28];
......
...@@ -27,16 +27,18 @@ ...@@ -27,16 +27,18 @@
# include "config.h" # include "config.h"
#endif #endif
#include "v4l2.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <poll.h> #include <poll.h>
#include <vlc_common.h>
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_fs.h> #include <vlc_fs.h>
#include "v4l2.h"
static int DemuxControl( demux_t *, int, va_list ); static int DemuxControl( demux_t *, int, va_list );
static int Demux( demux_t * ); static int Demux( demux_t * );
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <vlc_common.h>
#include "v4l2.h" #include "v4l2.h"
static void *v4l2_handle = NULL; static void *v4l2_handle = NULL;
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include <vlc_common.h>
#if defined(HAVE_LINUX_VIDEODEV2_H) #if defined(HAVE_LINUX_VIDEODEV2_H)
# include <linux/videodev2.h> # include <linux/videodev2.h>
#elif defined(HAVE_SYS_VIDEOIO_H) #elif defined(HAVE_SYS_VIDEOIO_H)
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
# include "config.h" # include "config.h"
#endif #endif
#include "v4l2.h"
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
...@@ -48,6 +44,12 @@ ...@@ -48,6 +44,12 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <poll.h> #include <poll.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include "v4l2.h"
/***************************************************************************** /*****************************************************************************
* Module descriptior * Module descriptior
*****************************************************************************/ *****************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment