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

avformat/matroskadec: Fix number suffixes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc3cdb00d0)

Conflicts:

	libavformat/matroskadec.c
(cherry picked from commit 201d626bb9)
This commit is contained in:
Michael Niedermayer
2015-02-01 19:34:52 +01:00
parent c21604b5e7
commit 5c36d0e1cd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroskadec.c
View File

@@ -1833,7 +1833,7 @@ static int matroska_read_header(AVFormatContext *s)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
1000000000, track->default_duration, 30000); 1000000000, track->default_duration, 30000);
#if FF_API_R_FRAME_RATE #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 * 1000LL)
st->r_frame_rate = st->avg_frame_rate; st->r_frame_rate = st->avg_frame_rate;
#endif #endif
} }