diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-29 02:56:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-29 02:59:15 +0100 |
| commit | 77524ee2dce92e5d82453d3ab2a616100d5df079 (patch) | |
| tree | d811dd873f86f2f76c2652dea68b0aee34e2d329 /libavformat | |
| parent | 1b659101852b5384717f3b1053b5fabb216f8eee (diff) | |
| download | ffmpeg-77524ee2dce92e5d82453d3ab2a616100d5df079.tar.gz | |
avformat/utils: Be slightly more tolerant with fps vs. stream timebase
Fixes regression with ticket2451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; 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; |