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
This commit is contained in:
Diego Biurrun
2007-04-03 21:09:36 +00:00
parent 3d18b282e0
commit 3af6d5cf2f
6 changed files with 10 additions and 12 deletions

View File

@@ -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);