diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-18 10:15:07 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-02-27 10:36:45 +0100 |
| commit | 4141a5a240fba44b4b4a1c488c279d7dd8a11ec7 (patch) | |
| tree | dda5c962984e3a4bb3a0461fb4c9973916eab5d6 /doc | |
| parent | da8093f712d625db7ce4a2526fb52994e01921ec (diff) | |
| download | ffmpeg-streaming-4141a5a240fba44b4b4a1c488c279d7dd8a11ec7.zip ffmpeg-streaming-4141a5a240fba44b4b4a1c488c279d7dd8a11ec7.tar.gz | |
Use modern avconv syntax for codec selection in documentation and tests
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/encoders.texi | 2 | ||||
| -rw-r--r-- | doc/faq.texi | 8 | ||||
| -rw-r--r-- | doc/filters.texi | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index bc5b336..41b8398 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -38,7 +38,7 @@ always faster, just that one or the other may be better suited to a particular system. The floating-point encoder will generally produce better quality audio for a given bitrate. The @var{ac3_fixed} encoder is not the default codec for any of the output formats, so it must be specified explicitly -using the option @code{-acodec ac3_fixed} in order to use it. +using the option @code{-c:a ac3_fixed} in order to use it. @subsection AC-3 Metadata diff --git a/doc/faq.texi b/doc/faq.texi index b400124..f3d55bd 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -234,7 +234,7 @@ mkfifo intermediate2.mpg avconv -i input1.avi -y intermediate1.mpg < /dev/null & avconv -i input2.avi -y intermediate2.mpg < /dev/null & cat intermediate1.mpg intermediate2.mpg |\ -avconv -f mpeg -i - -c:v mpeg4 -acodec libmp3lame output.avi +avconv -f mpeg -i - -c:v mpeg4 -c:a libmp3lame output.avi @end example Similarly, the yuv4mpegpipe format, and the raw video, raw audio codecs also @@ -253,13 +253,13 @@ mkfifo temp2.a mkfifo temp2.v mkfifo all.a mkfifo all.v -avconv -i input1.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - > temp1.a < /dev/null & -avconv -i input2.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - > temp2.a < /dev/null & +avconv -i input1.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp1.a < /dev/null & +avconv -i input2.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp2.a < /dev/null & avconv -i input1.flv -an -f yuv4mpegpipe - > temp1.v < /dev/null & @{ avconv -i input2.flv -an -f yuv4mpegpipe - < /dev/null | tail -n +2 > temp2.v ; @} & cat temp1.a temp2.a > all.a & cat temp1.v temp2.v > all.v & -avconv -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \ +avconv -f u16le -c:a pcm_s16le -ac 2 -ar 44100 -i all.a \ -f yuv4mpegpipe -i all.v \ -y output.flv rm temp[12].[av] all.[av] diff --git a/doc/filters.texi b/doc/filters.texi index 954765f..947fd79 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -661,10 +661,10 @@ avconv -i HDCD16.flac -af hdcd OUT24.flac When using the filter with WAV, note that the default encoding for WAV is 16-bit, so the resulting 20-bit stream will be truncated back to 16-bit. Use something -like @command{-acodec pcm_s24le} after the filter to get 24-bit PCM output. +like @command{-c:a pcm_s24le} after the filter to get 24-bit PCM output. @example avconv -i HDCD16.wav -af hdcd OUT16.wav -avconv -i HDCD16.wav -af hdcd -acodec pcm_s24le OUT24.wav +avconv -i HDCD16.wav -af hdcd -c:a pcm_s24le OUT24.wav @end example The filter accepts the following options: |
