]> git.sesse.net Git - ffmpeg/commitdiff
avformat/utils: Be slightly more tolerant with fps vs. stream timebase
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 29 Feb 2016 01:56:50 +0000 (02:56 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 29 Feb 2016 01:59:15 +0000 (02:59 +0100)
Fixes regression with ticket2451

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/utils.c

index 78255c32b187bbae7af966cd175bf99c8d63b3ba..fe2916ff97e16085eb970eb85f6e41c659e83d17 100644 (file)
@@ -3096,7 +3096,8 @@ void ff_rfps_calculate(AVFormatContext *ic)
             for (j= 0; j<MAX_STD_TIMEBASES; j++) {
                 int k;
 
-                if (st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
+                if (st->info->codec_info_duration &&
+                    st->info->codec_info_duration*av_q2d(st->time_base) < (1001*11.5)/get_std_framerate(j))
                     continue;
                 if (!st->info->codec_info_duration && get_std_framerate(j) < 1001*12)
                     continue;