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

[michael]

Author: michael
Date: Thu Nov 26 00:33:47 2009
New Revision: 20615

Log:
Remove special case that changed video sync behavior for av_q2d(enc->time_base) <= 0.001.
This should make the default behave more like one would expect and not
change behavior at 1000fps.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Thu Nov 26 00:32:26 2009	(r20614)
+++ trunk/ffmpeg.c	Thu Nov 26 00:33:47 2009	(r20615)
@@ -883,7 +883,7 @@ static void do_video_out(AVFormatContext
 
     *frame_size = 0;
 
-    if(video_sync_method>0 || (video_sync_method && av_q2d(enc->time_base) > 0.001)){
+    if(video_sync_method){
         double vdelta;
         vdelta = get_sync_ipts(ost) / av_q2d(enc->time_base) - ost->sync_opts;
         //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c