[SCM] libav/experimental: Include the correct video4linux2 header

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f743a06236ecf84b5cf28f8129efaf0da6ef37ef
Author: Luca Abeni <lucabe72 at email.it>
Date:   Tue May 30 13:04:18 2006 +0000

    Include the correct video4linux2 header
    
    Originally committed as revision 5430 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 01889aa..d674ea6 100755
--- 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
diff --git a/libavformat/v4l2.c b/libavformat/v4l2.c
index a355930..7404ef5 100644
--- a/libavformat/v4l2.c
+++ b/libavformat/v4l2.c
@@ -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;

-- 
Libav/FFmpeg packaging