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.
This commit is contained in:
Anton Khirnov 2011-11-20 12:46:24 +01:00
parent a94c769dad
commit e1edfbcb24

View File

@ -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;