[Ffmpeg-cvslog] r5430 - in trunk: configure libavformat/v4l2.c

[lucabe]

Author: lucabe
Date: Tue May 30 15:04:18 2006
New Revision: 5430

Modified:
   trunk/configure
   trunk/libavformat/v4l2.c

Log:
Include the correct video4linux2 header


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue May 30 15:04:18 2006
@@ -1273,7 +1273,8 @@
 # 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

Modified: trunk/libavformat/v4l2.c
==============================================================================
--- trunk/libavformat/v4l2.c	(original)
+++ trunk/libavformat/v4l2.c	Tue May 30 15:04:18 2006
@@ -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;