diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 00:07:28 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-24 11:27:50 +0200 |
| commit | 3c142c196d41db025ead08a2c98edb98ca4ab0af (patch) | |
| tree | 327b29832a885022042b330bffabb32f697a6875 | |
| parent | e3b2b884fc337d438e961ade6a435e846e8903f4 (diff) | |
| download | ffmpeg-3c142c196d41db025ead08a2c98edb98ca4ab0af.tar.gz | |
avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
Fixes Ticket2451
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6853e40106cac769f0641183ea0bdd530ae9a0a1)
| -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 fbc1d40310..9a0121a931 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1756,7 +1756,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 - st->r_frame_rate = st->avg_frame_rate; + if (st->avg_frame_rate.num < st->avg_frame_rate.den * 1000L) + st->r_frame_rate = st->avg_frame_rate; #endif } |