From 3af6d5cf2f790f7ca5bc002e937c6322a71559f8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 3 Apr 2007 21:09:36 +0000 Subject: 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 --- libavformat/allformats.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/allformats.c') diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 8534a18f69..09e3f0d756 100644 --- 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); -- cgit v1.2.3