[SCM] libav/experimental: Better documentation of -vsync

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 49553ec8657a9ff6935ee95fb166c73331fd8db5
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Mar 31 00:41:31 2010 +0000

    Better documentation of -vsync
    
    Originally committed as revision 22739 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 4a5f8d0..a2d7dc2 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}

-- 
Libav/FFmpeg packaging