From 9c52ab6f4f32466a2c263d393e73548d1f0f47c1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 9 Nov 2013 00:03:27 +0100 Subject: [PATCH] ffmpeg: treat avi as VFR in framerate conversion code It can be debated if avi is vfr or cfr, it can be either depending on the definition of vfr and cfr. This commit ensures that avi is treated correctly independent of the AVFMT_VARIABLE_FPS value. Signed-off-by: Michael Niedermayer --- ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index b1052c012e..a628fe637d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -819,8 +819,12 @@ static void do_video_out(AVFormatContext *s, nb_frames = 1; format_video_sync = video_sync_method; - if (format_video_sync == VSYNC_AUTO) - format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR; + if (format_video_sync == VSYNC_AUTO) { + if(!strcmp(s->oformat->name, "avi")) { + format_video_sync = VSYNC_VFR; + } else + format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR; + } switch (format_video_sync) { case VSYNC_CFR: