diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-03 21:09:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-03 21:09:36 +0000 |
| commit | 3af6d5cf2f790f7ca5bc002e937c6322a71559f8 (patch) | |
| tree | 18577d5105be88b52967819652dad500aa25b0f6 /libavformat/allformats.h | |
| parent | 3d18b282e0ecf21b02f3210446f6081b40fc4074 (diff) | |
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
Diffstat (limited to 'libavformat/allformats.h')
| -rw-r--r-- | libavformat/allformats.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/allformats.h b/libavformat/allformats.h index 286a7d584c..e82ab80f5a 100644 --- 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; |