diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-08-10 01:44:50 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-08-10 01:44:50 +0000 |
| commit | 63f8165914bc9d7572d2fa5744a46a5f4531fe79 (patch) | |
| tree | e95d4a1ae0b1ce56ba42cf42928a7bd9ce8febb1 /libavformat | |
| parent | a12df245a4f0634cc23f01840aa253f9e46cef7a (diff) | |
| download | ffmpeg-63f8165914bc9d7572d2fa5744a46a5f4531fe79.tar.gz | |
merge some REGISTER_MUXER/DEMUXER into REGISTER_MUXDEMUX
Originally committed as revision 10048 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index de4a5cf70b..a71f1bf3d5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -79,8 +79,7 @@ void av_register_all(void) REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXDEMUX(GIF, gif); - REGISTER_DEMUXER (GXF, gxf); - REGISTER_MUXER (GXF, gxf); + REGISTER_MUXDEMUX(GXF, gxf); REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); @@ -119,8 +118,7 @@ void av_register_all(void) REGISTER_MUXER (NULL, null); REGISTER_MUXDEMUX(NUT, nut); REGISTER_DEMUXER (NUV, nuv); - REGISTER_DEMUXER (OGG, ogg); - REGISTER_MUXER (OGG, ogg); + REGISTER_MUXDEMUX(OGG, ogg); REGISTER_MUXDEMUX(PCM_ALAW, pcm_alaw); REGISTER_MUXDEMUX(PCM_MULAW, pcm_mulaw); REGISTER_MUXDEMUX(PCM_S16BE, pcm_s16be); |