make ubuntu 11.04 compile with libv4l

2011-05-12 11:40:42 +00:00
parent 23a369b27e
commit 138b9724d8
3 changed files with 9 additions and 2 deletions
--- a/modules/highgui/src/cap_libv4l.cpp
+++ b/modules/highgui/src/cap_libv4l.cpp
@@ -224,7 +224,7 @@ make & enjoy!
 #include "highgui.h"
 #include "precomp.hpp"

-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
+#if !defined WIN32 && defined HAVE_LIBV4L

 #define CLEAR(x) memset (&(x), 0, sizeof (x))

@@ -241,8 +241,12 @@ make & enjoy!
 #include <sys/stat.h>
 #include <sys/ioctl.h>

+#ifdef HAVE_CAMV4L
 #include <linux/videodev.h>
+#endif
+#ifdef HAVE_CAMV4L2
 #include <linux/videodev2.h>
+#endif

 #include <libv4l1.h>
 #include <libv4l2.h>