[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:05 CEST 2013


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  6 00:07:28 2013 +0200| [3c142c196d41db025ead08a2c98edb98ca4ab0af] | 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=3c142c196d41db025ead08a2c98edb98ca4ab0af
---

 libavformat/matroskadec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index fbc1d40..9a0121a 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
             }
 



More information about the ffmpeg-cvslog mailing list