OSDN Git Service

avformat/matroskadec: Fix number suffixes
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 18:34:52 +0000 (19:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 19:22:17 +0000 (20:22 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc3cdb00d084222a107e61e7168903bf3d3d0b47)

Conflicts:

libavformat/matroskadec.c

libavformat/matroskadec.c

index f0a0d04..99baa08 100644 (file)
@@ -1883,7 +1883,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
             }