diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 20:23:40 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-01 17:39:56 +0100 |
| commit | 1abb0e563918ffec4c76c12e23f1a0647062a0fe (patch) | |
| tree | ef93d8c804da8f30f723cae01e27aa5c94594b35 | |
| parent | e5cf4d16c60e438ba027947645a1d0a732b49257 (diff) | |
| download | ffmpeg-1abb0e563918ffec4c76c12e23f1a0647062a0fe.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit be695ee389724d713e1b8a61ef899fe1795193ce)
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1d0f1b2eb5..767fa5e0a0 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1785,7 +1785,8 @@ static int matroska_read_header(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 } |