summaryrefslogtreecommitdiff
path: root/libavformat/allformats.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-07 13:43:40 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-07 13:43:40 +0000
commit50383e8822dfd6c8c98d76b511a733d1246683bb (patch)
treedbe34ce4d1a97cd0a1f027adf3214b56bb852dc6 /libavformat/allformats.c
parentbf61632b123cf92864173a6f40b5a0c821f6b078 (diff)
Separate audio_(de)muxer into oss_(de)muxer and audio_beos_(de)muxer
Originally committed as revision 10426 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/allformats.c')
-rw-r--r--libavformat/allformats.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index c8b7ea5045..b991a93186 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -55,7 +55,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (ASF, asf);
REGISTER_MUXER (ASF_STREAM, asf_stream);
REGISTER_MUXDEMUX (AU, au);
- REGISTER_MUXDEMUX (AUDIO, audio);
+ REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
REGISTER_MUXDEMUX (AVI, avi);
#ifdef CONFIG_AVISYNTH
av_register_input_format(&avisynth_demuxer);
@@ -121,6 +121,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (NUT, nut);
REGISTER_DEMUXER (NUV, nuv);
REGISTER_MUXDEMUX (OGG, ogg);
+ REGISTER_MUXDEMUX (OSS, oss);
REGISTER_MUXDEMUX (PCM_ALAW, pcm_alaw);
REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be);