diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-11-20 12:46:24 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-11-23 21:38:17 +0100 |
commit | e1edfbcb240cace69d92701e6910c2b03555b7d7 (patch) | |
tree | 0a4f5c16e8bc00142949844133c5caab9e91c69b /avconv.c | |
parent | a94c769dad502e2b782a09ece0ba490276239252 (diff) | |
download | ffmpeg-e1edfbcb240cace69d92701e6910c2b03555b7d7.tar.gz |
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
Prevent avconv from duplicating or dropping frames for formats where it
makes even less sense than usual, e.g. image2.
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1160,7 +1160,8 @@ static void do_video_out(AVFormatContext *s, format_video_sync = video_sync_method; if (format_video_sync < 0) - format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1; + format_video_sync = (s->oformat->flags & AVFMT_NOTIMESTAMPS) ? 0 : + (s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1; if (format_video_sync) { double vdelta = sync_ipts - ost->sync_opts; |