[FFmpeg-cvslog] avformat/utils: Be slightly more tolerant with fps vs. stream timebase

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Feb 29 02:56:50 2016 +0100| [77524ee2dce92e5d82453d3ab2a616100d5df079] | committer: Michael Niedermayer

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

Fixes regression with ticket2451

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77524ee2dce92e5d82453d3ab2a616100d5df079
---

 libavformat/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 78255c3..fe2916f 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;