summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2006-08-19 20:00:22 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2006-08-19 20:00:22 +0000
commitc52e13f1a154929808508def4ba9d3ba0c7a6fa1 (patch)
treee9c8d39c5948839d88baaa91beebd2fd76b91f59 /doc
parenta37e9e860682a8c171188aa975e244391f887f15 (diff)
-async and -vsync documentation. Based on info from the mailinglist.
Originally committed as revision 6028 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-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 9f3f85146b..c9b7c22994 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -504,6 +504,16 @@ streams. This option is used for automatic FFserver testing.
@item -loop_output number_of_times
Repeatedly loop output for formats that support looping such as animated GIF
(0 will loop the output infinitely).
+@item -vsync parameter
+Video sync method. Video will be stretched/sqeezed to match the timestamps,
+it is done by duplicating and droping frames. With -map you can select from
+which stream the timestamps should be taken, you can leave either video or
+audio unchanged and sync the remaining stream(s) to the unchanged one.
+@item -async samples_per_second
+Audio sync method. "Stretches/sqeezes" 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.
@end table
@node FFmpeg formula evaluator