From f6fe1935082d9dc1c6f923e80f62c9e9c90d1169 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 24 Feb 2010 23:57:04 +0000
Subject: Fix up V4L/V4L2 for non-Linux.

---
 src/input/Makefile.am  | 5 ++++-
 src/input/input_v4l2.c | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3