summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-11 11:50:32 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-18 08:48:30 +0200
commit3c0df9058438b68925be2fc6f5af2a05086ad99e (patch)
treebc1a2ace6271700af353e68bf7519ff2b852e1b1 /doc
parent91e59fea30f57af7abd1ad6a68a8f6663805ee44 (diff)
downloadffmpeg-3c0df9058438b68925be2fc6f5af2a05086ad99e.tar.gz
avconv: make -shortest a per-output file option.
Diffstat (limited to 'doc')
-rw-r--r--doc/avconv.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index ff5bb5297c..fc6402820b 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -752,7 +752,7 @@ This option has been deprecated. Use the @code{asyncts} audio filter instead.
Copy timestamps from input to output.
@item -copytb
Copy input stream time base from input to output when stream copying.
-@item -shortest
+@item -shortest (@emph{output})
Finish encoding when the shortest input stream ends.
@item -dts_delta_threshold
Timestamp discontinuity delta threshold.