[FFmpeg-cvslog] avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
Michael Niedermayer
git at videolan.org
Thu Oct 24 11:59:22 CEST 2013
ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 6 00:07:28 2013 +0200| [6de6d9e2d3eda809cf9b48b94795ae5e012d81de] | committer: Carl Eugen Hoyos
avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
Fixes Ticket2451
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6853e40106cac769f0641183ea0bdd530ae9a0a1)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6de6d9e2d3eda809cf9b48b94795ae5e012d81de
---
libavformat/matroskadec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b686eeb..1772640 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1829,7 +1829,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
}
More information about the ffmpeg-cvslog
mailing list