There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring

the video_grab_device_demuxer AVInputFormat.  Use two different names for the
AVInputFormats to reduce confusion and remove ugliness from the Makefile.

Originally committed as revision 8619 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 50c3570..5ea8a5e 100755 (executable)
--- a/configure
+++ b/configure
@@ -689,7 +689,8 @@ rtp_muxer_deps="network"
 rtsp_demuxer_deps="network"
 sdp_demuxer_deps="network"
 v4l2_demuxer_deps="v4l2"
-video_grab_device_demuxer_deps_any="v4l bktr"
+video_grab_bktr_demuxer_deps="bktr"
+video_grab_v4l_demuxer_deps="v4l"
 x11_grab_device_demuxer_deps="x11grab"
 
 ffplay_deps="sdl"

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 3d12752..01e68a9 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -144,13 +144,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
 
 OBJS+= framehook.o
 
-ifeq ($(CONFIG_V4L),yes)
-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
-endif
-
-ifeq ($(CONFIG_BKTR),yes)
-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
-endif
+OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER)    += grab.o
+OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER)   += grab_bktr.o
 
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
              -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 8534a18..09e3f0d 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -147,7 +147,8 @@ void av_register_all(void)
     REGISTER_DEMUXER (TTA, tta);
     REGISTER_DEMUXER (V4L2, v4l2);
     REGISTER_DEMUXER (VC1, vc1);
-    REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device);
+    REGISTER_DEMUXER (VIDEO_GRAB_BKTR, video_grab_bktr);
+    REGISTER_DEMUXER (VIDEO_GRAB_V4L, video_grab_v4l);
     REGISTER_DEMUXER (VMD, vmd);
     REGISTER_MUXDEMUX(VOC, voc);
     REGISTER_MUXDEMUX(WAV, wav);

diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 286a7d5..e82ab80 100644 (file)
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -99,7 +99,8 @@ extern AVInputFormat tiertexseq_demuxer;
 extern AVInputFormat tta_demuxer;
 extern AVInputFormat v4l2_demuxer;
 extern AVInputFormat vc1_demuxer;
-extern AVInputFormat video_grab_device_demuxer;
+extern AVInputFormat video_grab_bktr_demuxer;
+extern AVInputFormat video_grab_v4l_demuxer;
 extern AVInputFormat vmd_demuxer;
 extern AVInputFormat voc_demuxer;
 extern AVInputFormat wav_demuxer;

diff --git a/libavformat/grab.c b/libavformat/grab.c
index 5e778ec..8fe3997 100644 (file)
--- a/libavformat/grab.c
+++ b/libavformat/grab.c
@@ -375,7 +375,7 @@ static int grab_read_close(AVFormatContext *s1)
     return 0;
 }
 
-AVInputFormat video_grab_device_demuxer = {
+AVInputFormat video_grab_v4l_demuxer = {
     "video4linux",
     "video grab",
     sizeof(VideoData),

diff --git a/libavformat/grab_bktr.c b/libavformat/grab_bktr.c
index ec0c645..e40082f 100644 (file)
--- a/libavformat/grab_bktr.c
+++ b/libavformat/grab_bktr.c
@@ -308,7 +308,7 @@ static int grab_read_close(AVFormatContext *s1)
     return 0;
 }
 
-AVInputFormat video_grab_device_demuxer = {
+AVInputFormat video_grab_bktr_demuxer = {
     "bktr",
     "video grab",
     sizeof(VideoData),