summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-03-31 00:41:31 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-03-31 00:41:31 +0000
commit49553ec8657a9ff6935ee95fb166c73331fd8db5 (patch)
treea22ad8548c2332004e0265504835c700c638821c /doc
parent330d86f59377aca20372ba2e758f75e6ce45c4c2 (diff)
Better documentation of -vsync
Originally committed as revision 22739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 4a5f8d0bd9..a2d7dc290e 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -757,8 +757,15 @@ Repeatedly loop output for formats that support looping such as animated GIF
@item -threads @var{count}
Thread count.
@item -vsync @var{parameter}
-Video sync method. Video will be stretched/squeezed to match the timestamps,
-it is done by duplicating and dropping frames. With -map you can select from
+Video sync method.
+0 Each frame is passed with its timestamp from the demuxer to the muxer
+1 Frames will be duplicated and droped to achive exactly the requested
+ constant framerate.
+2 Frames are passed through with their timestamp or droped so as to prevent
+ 2 frames having the same timestamp
+-1 Chooses between 1 and 2 depending on muxer capabilities. This is default.
+
+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 @var{samples_per_second}