diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-11 01:26:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-11 01:27:38 +0200 |
| commit | 5e3da256184e13502b3428f94e180888436d157b (patch) | |
| tree | f7fe7878be400b38b909f9862bd3b0392b62e24c /doc | |
| parent | 3e56ae67d300f0eed2b9040fcc7c5e3229f0cde1 (diff) | |
| parent | 775a0b04f0cf8102fe322b2ee03fe1a0633dea04 (diff) | |
| download | ffmpeg-5e3da256184e13502b3428f94e180888436d157b.tar.gz | |
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -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 1bca962662..4fc76820e1 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1458,11 +1458,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: |