diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
| commit | a2b0602cdad8da62c137f7db07b608d6bbbcefaa (patch) | |
| tree | 67220614b5797dc9bd6ea58244a1a2e1e2e3197b /doc/faq.texi | |
| parent | 08c751309670854c73b58f234a83f4ba679370be (diff) | |
| parent | 4141a5a240fba44b4b4a1c488c279d7dd8a11ec7 (diff) | |
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
Use modern avconv syntax for codec selection in documentation and tests
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc/faq.texi')
| -rw-r--r-- | doc/faq.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index ff35c898dc..dcaf89c6d2 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -385,7 +385,7 @@ mkfifo intermediate2.mpg ffmpeg -i input1.avi -qscale:v 1 -y intermediate1.mpg < /dev/null & ffmpeg -i input2.avi -qscale:v 1 -y intermediate2.mpg < /dev/null & cat intermediate1.mpg intermediate2.mpg |\ -ffmpeg -f mpeg -i - -c:v mpeg4 -acodec libmp3lame output.avi +ffmpeg -f mpeg -i - -c:v mpeg4 -c:a libmp3lame output.avi @end example @subsection Concatenating using raw audio and video @@ -407,13 +407,13 @@ mkfifo temp2.a mkfifo temp2.v mkfifo all.a mkfifo all.v -ffmpeg -i input1.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - > temp1.a < /dev/null & -ffmpeg -i input2.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - > temp2.a < /dev/null & +ffmpeg -i input1.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp1.a < /dev/null & +ffmpeg -i input2.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp2.a < /dev/null & ffmpeg -i input1.flv -an -f yuv4mpegpipe - > temp1.v < /dev/null & @{ ffmpeg -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 & -ffmpeg -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \ +ffmpeg -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] |