summaryrefslogtreecommitdiff
path: root/doc/ffmpeg-doc.texi
diff options
context:
space:
mode:
authorVíctor Paesa <victorpaesa@googlemail.com>2007-06-21 20:21:36 +0000
committerVíctor Paesa <victorpaesa@googlemail.com>2007-06-21 20:21:36 +0000
commit43399718fb15d7c3a4cd91b508f8e3898a2a693c (patch)
tree0852db43207f37deae064bd0756306898b1d9cbd /doc/ffmpeg-doc.texi
parent5d38574617cf53eb9f39e4c221921421325e153b (diff)
Add a few missing Advanced Options.
Originally committed as revision 9385 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
-rw-r--r--doc/ffmpeg-doc.texi10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b6bf5c21fd..983c973fe2 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -709,6 +709,16 @@ Audio sync method. "Stretches/squeezes" the audio stream to match the timestamps
the parameter is the maximum samples per second by which the audio is changed.
-async 1 is a special case where only the start of the audio stream is corrected
without any later correction.
+@item -copyts
+Copy timestamps from input to output.
+@item -shortest
+Finish encoding when the shortest input stream ends.
+@item -dts_delta_threshold
+Timestamp discontinuity delta threshold.
+@item -muxdelay seconds
+Set the maximum demux-decode delay.
+@item -muxpreload seconds
+Set the initial demux-decode delay.
@end table
@node FFmpeg formula evaluator