diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-26 11:01:33 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-04 21:25:25 +0100 |
| commit | e8c04f6240b1557aadbab6242912e784656bc24d (patch) | |
| tree | 6c2513ff22bfc02c43eab2c3dffe356b1d32deb9 /doc | |
| parent | 2df73eefb4f7c954d2bb80afa823bb7d4f8e5006 (diff) | |
| download | ffmpeg-e8c04f6240b1557aadbab6242912e784656bc24d.tar.gz | |
avconv: add symbolic names for -vsync parameters
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avconv.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi index 157e233cc6..0a83326379 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -746,15 +746,15 @@ Thread count. Video sync method. @table @option -@item 0 +@item passthrough Each frame is passed with its timestamp from the demuxer to the muxer. -@item 1 +@item cfr Frames will be duplicated and dropped to achieve exactly the requested constant framerate. -@item 2 +@item vfr Frames are passed through with their timestamp or dropped so as to prevent 2 frames from having the same timestamp. -@item -1 +@item auto Chooses between 1 and 2 depending on muxer capabilities. This is the default method. @end table |