From e1edfbcb240cace69d92701e6910c2b03555b7d7 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 20 Nov 2011 12:46:24 +0100 Subject: 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. --- avconv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index a03c9c1..ff26bdd 100644 --- a/avconv.c +++ b/avconv.c @@ -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; -- cgit v1.1