Rename the format name audio_device (used in both oss and audio_beos) to oss and...

-f oss and -f audio_beos should be used instead.

Originally committed as revision 10429 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index dd015d4dfc8b67142935e326eedcec970874d7c4..3cdf3ab6169f2c465906b97eaa1214020564035a 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -30,7 +30,7 @@ FFmpeg can grab video and audio from devices given that you specify the input
 format and device.
 
 @example
-ffmpeg -f audio_device -i /dev/dsp -f video4linux2 -i /dev/video0 /tmp/out.mpg
+ffmpeg -f oss -i /dev/dsp -f video4linux2 -i /dev/video0 /tmp/out.mpg
 @end example
 
 Note that you must activate the right video source and channel before

diff --git a/libavformat/audio.c b/libavformat/audio.c
index 8c5df94be5b587ba41c6a9ef7be2bbb6f789df6f..6122b8be00bacbd58be71ff47fc8d406085ea0b1 100644 (file)
--- 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 48e01d86bd973d39ed04b5a01e5e0d3b87a47e35..d942d7e45d932be241a5357ed71b6951b237be32 100644 (file)
--- 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",
     "",
     "",