[Ffmpeg-cvslog] CVS: ffmpeg configure, 1.240, 1.241 ffmpeg.c, 1.367, 1.368

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv12748

Modified Files:
	configure ffmpeg.c 
Log Message:
video4linux2 input support
patch by Luca Abeni, lucabe72 $$at$$ email $$dot$$ it


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- configure	30 Jan 2006 00:22:41 -0000	1.240
+++ configure	1 Feb 2006 11:31:33 -0000	1.241
@@ -66,6 +66,7 @@
 echo "  --disable-audio-oss      disable OSS audio support [default=no]"
 echo "  --disable-audio-beos     disable BeOS audio support [default=no]"
 echo "  --disable-v4l            disable video4linux grabbing [default=no]"
+echo "  --disable-v4l2           disable video4linux2 grabbing [default=no]"
 echo "  --disable-bktr           disable bktr video grabbing [default=no]"
 echo "  --disable-dv1394         disable DV1394 grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
@@ -183,6 +184,7 @@
 esac
 gprof="no"
 v4l="yes"
+v4l2="yes"
 bktr="no"
 audio_oss="yes"
 audio_beos="no"
@@ -276,6 +278,7 @@
 # disable Linux things
 audio_oss="no"
 v4l="no"
+v4l2="no"
 dv1394="no"
 # enable BeOS things
 audio_beos="yes"
@@ -290,6 +293,7 @@
 fi ;;
 SunOS)
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
 make="gmake"
@@ -300,6 +304,7 @@
 ;;
 NetBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -312,6 +317,7 @@
 ;;
 OpenBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -323,6 +329,7 @@
 ;;
 FreeBSD)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -332,6 +339,7 @@
 ;;
 BSD/OS)
 v4l="no"
+v4l2="no"
 bktr="yes"
 audio_oss="yes"
 dv1394="no"
@@ -343,6 +351,7 @@
 Darwin)
 cc="cc"
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
 ffserver="no"
@@ -364,6 +373,7 @@
 ;;
 CYGWIN*)
 v4l="no"
+v4l2="no"
 audio_oss="yes"
 dv1394="no"
 vhook="no"
@@ -377,6 +387,7 @@
 IRIX*)
 ranlib="echo ignoring ranlib"
 v4l="no"
+v4l2="no"
 audio_oss="no"
 make="gmake"
 ;;
@@ -397,6 +408,7 @@
 extralibs=""
 pkg_requires=""
 v4l="no"
+v4l2="no"
 audio_oss="no"
 dv1394="no"
 network="no"
@@ -486,6 +498,8 @@
   ;;
   --disable-v4l) v4l="no"
   ;;
+  --disable-v4l2) v4l2="no"
+  ;;
   --disable-bktr) bktr="no"
   ;;
   --disable-audio-oss) audio_oss="no"
@@ -900,6 +914,7 @@
         exit 1
     fi
     v4l="no"
+    v4l2="no"
     bktr="no"
     audio_oss="no"
     dv1394="no"
@@ -1613,6 +1628,11 @@
   echo "CONFIG_VIDEO4LINUX=yes" >> config.mak
 fi
 
+if test "$v4l2" = "yes" ; then
+  echo "#define CONFIG_VIDEO4LINUX2 1" >> $TMPH
+  echo "CONFIG_VIDEO4LINUX2=yes" >> config.mak
+fi
+
 if test "$bktr" = "yes" ; then
   echo "#define CONFIG_BKTR 1" >> $TMPH
   echo "CONFIG_BKTR=yes" >> config.mak

Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- ffmpeg.c	30 Jan 2006 23:33:16 -0000	1.367
+++ ffmpeg.c	1 Feb 2006 11:31:33 -0000	1.368
@@ -213,8 +213,12 @@
 #ifdef CONFIG_BKTR
 static char *video_grab_format = "bktr";
 #else
+#ifdef CONFIG_VIDEO4LINUX2
+static char *video_grab_format = "video4linux2";
+#else
 static char *video_grab_format = "video4linux";
 #endif
+#endif
 static char *video_device = NULL;
 static char *grab_device = NULL;
 static int  video_channel = 0;