diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-08 20:23:40 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <[email protected]> | 2014-11-01 15:48:58 +0100 |
| commit | 4f515913a205475433c622aca14612f4d4a3cda0 (patch) | |
| tree | 91e02ed8166627f41b9553b1b129785c6e40a1df | |
| parent | b44506c393b176dc396502ad262ac18bec52a110 (diff) | |
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)
| -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 fdfba57d92..ea0b5abecf 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 } |