diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-24 23:57:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-24 23:57:04 +0000 |
| commit | f6fe1935082d9dc1c6f923e80f62c9e9c90d1169 (patch) | |
| tree | 3b8f5425fca60835b44ff7116689b9935a02fdf4 /src | |
| parent | b808b9acc254027fa881c3123ab1b73984e2c1dd (diff) | |
| download | xine-lib-f6fe1935082d9dc1c6f923e80f62c9e9c90d1169.tar.gz xine-lib-f6fe1935082d9dc1c6f923e80f62c9e9c90d1169.tar.bz2 | |
Fix up V4L/V4L2 for non-Linux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/Makefile.am | 5 | ||||
| -rw-r--r-- | src/input/input_v4l2.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 1c34f9aaa..beb101f8c 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -21,10 +21,13 @@ endif if HAVE_V4L in_v4l = xineplug_inp_v4l.la -in_v4l2 = xineplug_inp_v4l2.la in_pvr = xineplug_inp_pvr.la endif +if HAVE_V4L2 +in_v4l2 = xineplug_inp_v4l2.la +endif + if HAVE_GNOME_VFS in_gnome_vfs = xineplug_inp_gnome_vfs.la endif diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c index 255b1f17c..5396594f4 100644 --- a/src/input/input_v4l2.c +++ b/src/input/input_v4l2.c @@ -37,7 +37,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <linux/videodev2.h> +#ifdef HAVE_SYS_VIDEOIO_H +# include <sys/videoio.h> +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include <sys/videodev2.h> +#else +# include <linux/videodev2.h> +#endif #include <sys/mman.h> #include <stdio.h> #include <errno.h> |