From 77524ee2dce92e5d82453d3ab2a616100d5df079 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 29 Feb 2016 02:56:50 +0100 Subject: avformat/utils: Be slightly more tolerant with fps vs. stream timebase Fixes regression with ticket2451 Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 78255c32b1..fe2916ff97 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3096,7 +3096,8 @@ void ff_rfps_calculate(AVFormatContext *ic) for (j= 0; jinfo->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; -- cgit v1.2.3