diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:48:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:48:28 +0200 |
| commit | 3bc5aa65bbcf79e869461a557bea356a66e0e77e (patch) | |
| tree | 1ccca145cbe227a3eb18d798a1ab2af3bf497c72 | |
| parent | da1dfea07670d450653c6d36442f80d7614c9fb3 (diff) | |
| parent | 40c7613ecf2f3f7565309f9780183228605c3684 (diff) | |
| download | ffmpeg-3bc5aa65bbcf79e869461a557bea356a66e0e77e.tar.gz | |
Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2
* commit '40c7613ecf2f3f7565309f9780183228605c3684':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/ffmpeg.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index c0a81c811a..828c331ef6 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1405,11 +1405,11 @@ ffmpeg -f image2 -pattern_type glob -i 'foo-*.jpeg' -r 12 -s WxH foo.avi You can put many streams of the same type in the output: @example -ffmpeg -i test1.avi -i test2.avi -map 0:3 -map 0:2 -map 0:1 -map 0:0 -c copy test12.nut +ffmpeg -i test1.avi -i test2.avi -map 1:1 -map 1:0 -map 0:1 -map 0:0 -c copy -y test12.nut @end example -The resulting output file @file{test12.avi} will contain first four streams from -the input file in reverse order. +The resulting output file @file{test12.nut} will contain the first four streams +from the input files in reverse order. @item To force CBR video output: |