aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-09-10 18:38:15 +0200
committerDiego Biurrun <diego@biurrun.de>2014-09-10 12:02:24 -0700
commit40c7613ecf2f3f7565309f9780183228605c3684 (patch)
treee57e4fc263ad4cafe6acd77717057e9b687f3b48
parent1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe (diff)
downloadffmpeg-40c7613ecf2f3f7565309f9780183228605c3684.tar.gz
doc: Fix syntax and logical errors in avconv stream combination example
Bug-Id: 661 CC: libav-stable@libav.org (cherry picked from commit 775a0b04f0cf8102fe322b2ee03fe1a0633dea04) Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--doc/avconv.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 7ef415fc7d..cb0f33168c 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -1097,11 +1097,11 @@ only formats accepting a normal integer are suitable.
You can put many streams of the same type in the output:
@example
-avconv -i test1.avi -i test2.avi -map 0.3 -map 0.2 -map 0.1 -map 0.0 -c copy test12.nut
+avconv -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: