ffmpeg | branch: release/2.3 | Michael Niedermayer <[email protected]> | Wed Oct 8 20:23:40 2014 +0200| [4f515913a205475433c622aca14612f4d4a3cda0] | committer: Carl Eugen Hoyos
avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps Fixes Ticket3980 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit be695ee389724d713e1b8a61ef899fe1795193ce) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f515913a205475433c622aca14612f4d4a3cda0 --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index fdfba57..ea0b5ab 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1979,7 +1979,8 @@ static int matroska_parse_tracks(AVFormatContext *s) av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, 1000000000, track->default_duration, 30000); #if FF_API_R_FRAME_RATE - if (st->avg_frame_rate.num < st->avg_frame_rate.den * 1000L) + if ( st->avg_frame_rate.num < st->avg_frame_rate.den * 1000L + && st->avg_frame_rate.num > st->avg_frame_rate.den * 5L) st->r_frame_rate = st->avg_frame_rate; #endif } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
