Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-01 21:34:52 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 03:13:08 +0300
commit5c36d0e1cdb861df3958b05133d917e3b81a9d6f (patch)
tree0ac1b1894ca856c7c829c6defeb2a7043b1901a3
parentc21604b5e72d8481d24853332bc5b04b904c474d (diff)
avformat/matroskadec: Fix number suffixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fc3cdb00d084222a107e61e7168903bf3d3d0b47) Conflicts: libavformat/matroskadec.c (cherry picked from commit 201d626bb90ea3ca22f0168b8e2085bbd16ac984)
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 9aa2cffdbf..6e765d9d1a 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1833,7 +1833,7 @@ 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
- 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;
#endif
}