[Gridflow-cvs] [svn] commit: r6722 - /trunk/src/v4l2.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Sat Mar 5 20:47:17 EST 2011


Author: matju
Date: Sat Mar  5 20:47:16 2011
New Revision: 6722

Log:
assume HAVE_LIBV4L2

Modified:
    trunk/src/v4l2.cxx

Modified: trunk/src/v4l2.cxx
==============================================================================
--- trunk/src/v4l2.cxx (original)
+++ trunk/src/v4l2.cxx Sat Mar  5 20:47:16 2011
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <linux/videodev2.h>
-#include <libv4l2.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/mman.h>
@@ -35,19 +34,13 @@
 //#define error post
 static bool debug=1;
 
-#ifdef HAVE_LIBV4L2
-#include <libv4l1.h>
+#include <libv4l2.h>
 //#define open   v4l2_open
 #define close  v4l2_close
 #define ioctl  v4l2_ioctl
 #define mmap   v4l2_mmap
 #define munmap v4l2_munmap
 #define read   v4l2_read
-#warning Using libv4l2 !!!
-#else
-#warning NOT Using libv4l2 !!!
-#define v4l2_open(a,b) (RAISE("this [#io.v4l2] wasn't compiled with libv4l2 support"),-1)
-#endif
 
 /* **************************************************************** */
 



More information about the Gridflow-cvs mailing list