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 10:57:14 +0200 |
| commit | eff0bf7defdf36574ad6670643ee032099ec5b71 (patch) | |
| tree | 67b437bfde95dec6ee948da257adc3168816dfba | |
| parent | 6559bb893f5f180e70f9b50064f63086aed70793 (diff) | |
| download | ffmpeg-eff0bf7defdf36574ad6670643ee032099ec5b71.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 aea5fe44d8..f97e239a73 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1781,7 +1781,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 } |