# HG changeset patch
# User diego
# Date 1175634576 0
# Node ID 1805da944f22034b90af6f4e7308cb6e43db671d
# Parent  b7016078f7c7c2abd2dd62295628ab08c2a2c59c
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.

diff -r b7016078f7c7 -r 1805da944f22 Makefile
--- a/Makefile	Tue Apr 03 16:47:43 2007 +0000
+++ b/Makefile	Tue Apr 03 21:09:36 2007 +0000
@@ -144,13 +144,8 @@
 
 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 -r b7016078f7c7 -r 1805da944f22 allformats.c
--- a/allformats.c	Tue Apr 03 16:47:43 2007 +0000
+++ b/allformats.c	Tue Apr 03 21:09:36 2007 +0000
@@ -147,7 +147,8 @@
     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 -r b7016078f7c7 -r 1805da944f22 allformats.h
--- a/allformats.h	Tue Apr 03 16:47:43 2007 +0000
+++ b/allformats.h	Tue Apr 03 21:09:36 2007 +0000
@@ -99,7 +99,8 @@
 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 -r b7016078f7c7 -r 1805da944f22 grab.c
--- a/grab.c	Tue Apr 03 16:47:43 2007 +0000
+++ b/grab.c	Tue Apr 03 21:09:36 2007 +0000
@@ -375,7 +375,7 @@
     return 0;
 }
 
-AVInputFormat video_grab_device_demuxer = {
+AVInputFormat video_grab_v4l_demuxer = {
     "video4linux",
     "video grab",
     sizeof(VideoData),
diff -r b7016078f7c7 -r 1805da944f22 grab_bktr.c
--- a/grab_bktr.c	Tue Apr 03 16:47:43 2007 +0000
+++ b/grab_bktr.c	Tue Apr 03 21:09:36 2007 +0000
@@ -308,7 +308,7 @@
     return 0;
 }
 
-AVInputFormat video_grab_device_demuxer = {
+AVInputFormat video_grab_bktr_demuxer = {
     "bktr",
     "video grab",
     sizeof(VideoData),