From ad48c9f0b833c61ee6b883b9492d79d0a449ee44 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 24 Feb 2009 15:06:17 +0000
Subject: [PATCH] Do not duplicate frames if the muxer claims that it is not
needed. Note to release manager, this is risky and should be reverted if it
causes any problem.
Originally committed as revision 17555 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 3c5e333ac47..79ad1a4263f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -865,7 +865,7 @@ static void do_video_out(AVFormatContext *s,
//FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
if (vdelta < -1.1)
nb_frames = 0;
- else if (video_sync_method == 2)
+ else if (video_sync_method == 2 || (video_sync_method<0 && (s->oformat->flags & AVFMT_VARIABLE_FPS)))
ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base));
else if (vdelta > 1.1)
nb_frames = lrintf(vdelta);
--
GitLab