summaryrefslogtreecommitdiff
path: root/libavformat/allformats.h
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.h
parentbf61632b123cf92864173a6f40b5a0c821f6b078 (diff)
downloadffmpeg-50383e8822dfd6c8c98d76b511a733d1246683bb.tar.gz
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.h')
-rw-r--r--libavformat/allformats.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 489839c7c8..1a8509b011 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -31,7 +31,7 @@ extern AVInputFormat amr_demuxer;
extern AVInputFormat apc_demuxer;
extern AVInputFormat asf_demuxer;
extern AVInputFormat au_demuxer;
-extern AVInputFormat audio_demuxer;
+extern AVInputFormat audio_beos_demuxer;
extern AVInputFormat avi_demuxer;
extern AVInputFormat avisynth_demuxer;
extern AVInputFormat avs_demuxer;
@@ -82,6 +82,7 @@ extern AVInputFormat nsv_demuxer;
extern AVInputFormat nut_demuxer;
extern AVInputFormat nuv_demuxer;
extern AVInputFormat ogg_demuxer;
+extern AVInputFormat oss_demuxer;
extern AVInputFormat pcm_alaw_demuxer;
extern AVInputFormat pcm_mulaw_demuxer;
extern AVInputFormat pcm_s16be_demuxer;
@@ -125,7 +126,7 @@ extern AVOutputFormat amr_muxer;
extern AVOutputFormat asf_muxer;
extern AVOutputFormat asf_stream_muxer;
extern AVOutputFormat au_muxer;
-extern AVOutputFormat audio_muxer;
+extern AVOutputFormat audio_beos_muxer;
extern AVOutputFormat avi_muxer;
extern AVOutputFormat crc_muxer;
extern AVOutputFormat dv_muxer;
@@ -164,6 +165,7 @@ extern AVOutputFormat mpjpeg_muxer;
extern AVOutputFormat null_muxer;
extern AVOutputFormat nut_muxer;
extern AVOutputFormat ogg_muxer;
+extern AVOutputFormat oss_muxer;
extern AVOutputFormat pcm_alaw_muxer;
extern AVOutputFormat pcm_mulaw_muxer;
extern AVOutputFormat pcm_s16be_muxer;