Include the correct video4linux2 header
authorLuca Abeni <lucabe72@email.it>
Tue, 30 May 2006 13:04:18 +0000 (13:04 +0000)
committerLuca Abeni <lucabe72@email.it>
Tue, 30 May 2006 13:04:18 +0000 (13:04 +0000)
Originally committed as revision 5430 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure
libavformat/v4l2.c

index 01889aa..d674ea6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1273,7 +1273,8 @@ if test "$v4l2" = "yes"; then
 # check for video4linux2 --- V4L2_PIX_FMT_YUV420
 cat > $TMPC << EOF
 #include <sys/time.h>
-#include <linux/videodev.h>
+#include <asm/types.h>
+#include <linux/videodev2.h>
 int dummy = V4L2_PIX_FMT_YUV420;
 struct v4l2_buffer dummy1;
 EOF
index a355930..7404ef5 100644 (file)
@@ -30,8 +30,8 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-#define _LINUX_TIME_H 1
-#include <linux/videodev.h>
+#include <asm/types.h>
+#include <linux/videodev2.h>
 #include <time.h>
 
 static const int desired_video_buffers = 256;