summaryrefslogtreecommitdiff
path: root/libavformat/audio.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/audio.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/audio.c')
-rw-r--r--libavformat/audio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/audio.c b/libavformat/audio.c
index ce209d1a9f..8c5df94be5 100644
--- a/libavformat/audio.c
+++ b/libavformat/audio.c
@@ -307,8 +307,8 @@ static int audio_read_close(AVFormatContext *s1)
return 0;
}
-#ifdef CONFIG_AUDIO_DEMUXER
-AVInputFormat audio_demuxer = {
+#ifdef CONFIG_OSS_DEMUXER
+AVInputFormat oss_demuxer = {
"audio_device",
"audio grab and output",
sizeof(AudioData),
@@ -320,8 +320,8 @@ AVInputFormat audio_demuxer = {
};
#endif
-#ifdef CONFIG_AUDIO_MUXER
-AVOutputFormat audio_muxer = {
+#ifdef CONFIG_OSS_MUXER
+AVOutputFormat oss_muxer = {
"audio_device",
"audio grab and output",
"",