diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:04:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:04:48 +0100 |
| commit | 2b8effcda3f98e3df48bed305ee416bbe06c7230 (patch) | |
| tree | dbd5cafcfa7d7255284c0cd9967250601e5ab8de | |
| parent | f3c8a8b087d08019604fd641970b49144cc3dfa2 (diff) | |
| parent | 9920a8a83f578821e00212da6b79c8997a725fa8 (diff) | |
| download | ffmpeg-2b8effcda3f98e3df48bed305ee416bbe06c7230.tar.gz | |
Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1
* commit '9920a8a83f578821e00212da6b79c8997a725fa8':
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 0c3cbc3cde..415491d363 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1254,11 +1254,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: |