summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-01-17 13:32:17 +0100
committerStefano Sabatini <stefasab@gmail.com>2012-01-17 23:50:47 +0100
commit6c06868e61c0f9faab255d0cf782690371520e04 (patch)
tree22d913915cdaa4857921ef50c1522c0b7ea828a2 /doc/ffmpeg.texi
parentd393f41a33abc093a6a5ca1999e6c2515a86498a (diff)
doc/ffmpeg.texi: specify symbolic names for the vsync parameter
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 83a45a8db6..e2f6add250 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -919,15 +919,15 @@ Thread count.
Video sync method.
@table @option
-@item 0
+@item 0, passthrough
Each frame is passed with its timestamp from the demuxer to the muxer.
-@item 1
+@item 1, cfr
Frames will be duplicated and dropped to achieve exactly the requested
constant framerate.
-@item 2
+@item 2, vfr
Frames are passed through with their timestamp or dropped so as to
prevent 2 frames from having the same timestamp.
-@item -1
+@item -1, auto
Chooses between 1 and 2 depending on muxer capabilities. This is the
default method.
@end table