diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-07 13:49:44 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-07 13:49:44 +0000 |
| commit | 1156c6b05fb365237aa3cbfe5414cc7ea72314ba (patch) | |
| tree | b1f5cae860c44484c9bd766bf8976725864eb630 | |
| parent | c7682de075099bb05d44c7d4730baa55cc9e44f2 (diff) | |
| download | ffmpeg-1156c6b05fb365237aa3cbfe5414cc7ea72314ba.tar.gz | |
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
| -rw-r--r-- | doc/ffmpeg-doc.texi | 2 | ||||
| -rw-r--r-- | libavformat/audio.c | 4 | ||||
| -rw-r--r-- | libavformat/beosaudio.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index dd015d4dfc..3cdf3ab616 100644 --- 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 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", "", "", |