OSDN Git Service

Remove special case that changed video sync behavior for av_q2d(enc->time_base) ...
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Nov 2009 23:33:47 +0000 (23:33 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Nov 2009 23:33:47 +0000 (23:33 +0000)
This should make the default behave more like one would expect and not
change behavior at 1000fps.

Originally committed as revision 20615 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 5d6d994..2cb9132 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -883,7 +883,7 @@ static void do_video_out(AVFormatContext *s,
 
     *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