summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-01-28 19:56:13 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-01-28 22:01:09 +0100
commit47a5274104cf1b0a33c3405aa6e2842fe4aea46d (patch)
treec14f35b6449c73ee9bfbfb6be4999062ba0d380d /doc/ffmpeg.texi
parent836110665f181465f4d44b57ca86599677fd12b9 (diff)
Add -vsync drop.
This allows to work around any non-monotonic time-stamp errors by just discarding all time stamps. This will be necessary to allow H.264 conformance tests to pass after fixing time stamps to be passed through rawenc. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index ecf147ab55..55748f1e83 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -939,6 +939,8 @@ This option is deprecated, use -loop.
Thread count.
@item -vsync @var{parameter}
Video sync method.
+For compatibility reasons old values can be specified as numbers.
+Newly added values will have to be specified as strings always.
@table @option
@item 0, passthrough
@@ -949,6 +951,9 @@ constant framerate.
@item 2, vfr
Frames are passed through with their timestamp or dropped so as to
prevent 2 frames from having the same timestamp.
+@item drop
+As passthrough but destroys all timestamps, making the muxer generate
+fresh timestamps based on frame-rate.
@item -1, auto
Chooses between 1 and 2 depending on muxer capabilities. This is the
default method.