[FFmpeg-cvslog] r17555 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Tue Feb 24 16:06:17 2009
New Revision: 17555

Log:
Do not duplicate frames if the muxer claims that its not needed.
Note to release manager, this is risky and should be reverted if it causes any problem.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Tue Feb 24 16:04:18 2009	(r17554)
+++ trunk/ffmpeg.c	Tue Feb 24 16:06:17 2009	(r17555)
@@ -865,7 +865,7 @@ static void do_video_out(AVFormatContext
         //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);