generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps

Browse Source 
Fixes Ticket3980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be695ee389724d713e1b8a61ef899fe1795193ce)
This commit is contained in:
Michael Niedermayer 2014-10-08 20:23:40 +02:00 committed by Carl Eugen Hoyos
parent b44506c393
commit 4f515913a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskadec.c
View File

@ -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
}