From 5523d5f41ef1b47bf262c333e504f589668ed30f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 3 Oct 2006 19:13:27 +0000 Subject: fix r_frame_rate detection in mpeg4 streams with non integer fps Originally committed as revision 6544 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libavformat') diff --git a/libavformat/utils.c b/libavformat/utils.c index 09be967708..1405d2c09a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1961,10 +1961,15 @@ int av_find_stream_info(AVFormatContext *ic) } } - /* if no real frame rate, use the codec one */ if (!st->r_frame_rate.num){ - st->r_frame_rate.num = st->codec->time_base.den; - st->r_frame_rate.den = st->codec->time_base.num; + if( st->codec->time_base.den * (int64_t)st->time_base.num + <= st->codec->time_base.num * (int64_t)st->time_base.den){ + st->r_frame_rate.num = st->codec->time_base.den; + st->r_frame_rate.den = st->codec->time_base.num; + }else{ + st->r_frame_rate.num = st->time_base.den; + st->r_frame_rate.den = st->time_base.num; + } } } } -- cgit v1.2.3