[Ffmpeg-cvslog] CVS: ffmpeg configure, 1.185, 1.186 ffmpeg.c, 1.334, 1.335

[Michael Niedermayer CVS]

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

Modified Files:
	configure ffmpeg.c 
Log Message:
*BSD bktr grab support by (Jacob Meuser: jakemsr, jakemsr com)


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- configure	29 May 2005 22:11:05 -0000	1.185
+++ configure	25 Jun 2005 09:04:08 -0000	1.186
@@ -57,6 +57,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-bktr           disable bktr video grabbing [default=no]"
 echo "  --disable-dv1394         disable DV1394 grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
 echo "  --disable-zlib           disable zlib [default=no]"
@@ -153,6 +154,7 @@
 esac
 gprof="no"
 v4l="yes"
+bktr="no"
 audio_oss="yes"
 audio_beos="no"
 dv1394="yes"
@@ -258,6 +260,7 @@
 ;;
 NetBSD)
 v4l="no"
+bktr="yes"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
@@ -269,6 +272,7 @@
 ;;
 OpenBSD)
 v4l="no"
+bktr="yes"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
@@ -279,6 +283,7 @@
 ;;
 FreeBSD)
 v4l="no"
+bktr="yes"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
@@ -287,6 +292,7 @@
 ;;
 BSD/OS)
 v4l="no"
+bktr="yes"
 audio_oss="yes"
 dv1394="no"
 extralibs="-lpoll -lgnugetopt -lm"
@@ -431,6 +437,8 @@
   ;;
   --disable-v4l) v4l="no"
   ;;
+  --disable-bktr) bktr="no"
+  ;;
   --disable-audio-oss) audio_oss="no"
   ;;
   --disable-audio-beos) audio_beos="no"
@@ -769,6 +777,7 @@
 
 if test "$mingw32" = "yes" ; then
     v4l="no"
+    bktr="no"
     audio_oss="no"
     dv1394="no"
     dc1394="no"
@@ -1386,6 +1395,11 @@
   echo "CONFIG_VIDEO4LINUX=yes" >> config.mak
 fi
 
+if test "$bktr" = "yes" ; then
+  echo "#define CONFIG_BKTR 1" >> $TMPH
+  echo "CONFIG_BKTR=yes" >> config.mak
+fi
+
 if test "$dv1394" = "yes" ; then
   echo "#define CONFIG_DV1394 1" >> $TMPH
   echo "CONFIG_DV1394=yes" >> config.mak

Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- ffmpeg.c	18 Jun 2005 01:52:24 -0000	1.334
+++ ffmpeg.c	25 Jun 2005 09:04:08 -0000	1.335
@@ -257,7 +257,11 @@
 
 static int rate_emu = 0;
 
+#ifdef CONFIG_BKTR
+static char *video_grab_format = "bktr";
+#else
 static char *video_grab_format = "video4linux";
+#endif
 static char *video_device = NULL;
 static char *grab_device = NULL;
 static int  video_channel = 0;