Commit 77524ee2 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/utils: Be slightly more tolerant with fps vs. stream timebase

Fixes regression with ticket2451
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 1b659101
...@@ -3096,7 +3096,8 @@ void ff_rfps_calculate(AVFormatContext *ic) ...@@ -3096,7 +3096,8 @@ void ff_rfps_calculate(AVFormatContext *ic)
for (j= 0; j<MAX_STD_TIMEBASES; j++) { for (j= 0; j<MAX_STD_TIMEBASES; j++) {
int k; 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; continue;
if (!st->info->codec_info_duration && get_std_framerate(j) < 1001*12) if (!st->info->codec_info_duration && get_std_framerate(j) < 1001*12)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment