summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-07 13:49:44 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-07 13:49:44 +0000
commit1156c6b05fb365237aa3cbfe5414cc7ea72314ba (patch)
treeb1f5cae860c44484c9bd766bf8976725864eb630 /libavformat
parentc7682de075099bb05d44c7d4730baa55cc9e44f2 (diff)
Rename the format name audio_device (used in both oss and audio_beos) to oss and audio_beos.
-f oss and -f audio_beos should be used instead. Originally committed as revision 10429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/audio.c4
-rw-r--r--libavformat/beosaudio.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/audio.c b/libavformat/audio.c
index 8c5df94be5..6122b8be00 100644
--- a/libavformat/audio.c
+++ b/libavformat/audio.c
@@ -309,7 +309,7 @@ static int audio_read_close(AVFormatContext *s1)
#ifdef CONFIG_OSS_DEMUXER
AVInputFormat oss_demuxer = {
- "audio_device",
+ "oss",
"audio grab and output",
sizeof(AudioData),
NULL,
@@ -322,7 +322,7 @@ AVInputFormat oss_demuxer = {
#ifdef CONFIG_OSS_MUXER
AVOutputFormat oss_muxer = {
- "audio_device",
+ "oss",
"audio grab and output",
"",
"",
diff --git a/libavformat/beosaudio.cpp b/libavformat/beosaudio.cpp
index 48e01d86bd..d942d7e45d 100644
--- a/libavformat/beosaudio.cpp
+++ b/libavformat/beosaudio.cpp
@@ -422,7 +422,7 @@ static int audio_read_close(AVFormatContext *s1)
}
static AVInputFormat audio_beos_demuxer = {
- "audio_device",
+ "audio_beos",
"audio grab and output",
sizeof(AudioData),
NULL,
@@ -434,7 +434,7 @@ static AVInputFormat audio_beos_demuxer = {
};
AVOutputFormat audio_beos_muxer = {
- "audio_device",
+ "audio_beos",
"audio grab and output",
"",
"",