Commit 1156c6b0 authored by Ramiro Polla's avatar Ramiro Polla
Browse files

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
parent c7682de0
......@@ -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
......
......@@ -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",
"",
"",
......
......@@ -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",
"",
"",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment