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 15:37:36 +0100 |
| commit | a8a6cdfcd7b64964513292da9317645a8a510191 (patch) | |
| tree | 5d110dab76baac0b45a2df98d6c8d6d9d37bbed9 | |
| parent | 39518589e73ed08f6afad7dc0d7ced1bcfbdaf92 (diff) | |
| download | ffmpeg-a8a6cdfcd7b64964513292da9317645a8a510191.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 b8ddf67b79..e3cd1e4ecc 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1920,7 +1920,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 } |