summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>2015-05-03 23:07:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-04 00:16:00 +0200
commiteb9fb508b0e09d85d234fe694333b2005e1d7a7e (patch)
tree099f763eec25be1967525b7dab62e1d43e5450c3 /libavformat/matroskadec.c
parent800df6a849c81ee74ad770e4551327aa2159336c (diff)
matroskadec: use uint64_t instead of int for index_scale
index_scale is set to matroska->time_scale of type uint64_t. When index_scale is int, the assignment can overflow and e.g. result in index_scale = 0. This causes a floating point exception due to the division by index_scale. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 301304b5d9..27d184ef48 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1504,7 +1504,7 @@ static void matroska_add_index_entries(MatroskaDemuxContext *matroska)
{
EbmlList *index_list;
MatroskaIndex *index;
- int index_scale = 1;
+ uint64_t index_scale = 1;
int i, j;
if (matroska->ctx->flags & AVFMT_FLAG_IGNIDX)