diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-05-03 23:07:20 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-05-14 19:09:19 +0200 |
| commit | 33d77bc384676fc6b0ca51777519b001994d76df (patch) | |
| tree | 69e6a94b66769f197f54c56c0a1bc7f89196aed0 | |
| parent | e6a5023d1f2f3ec5aaf8ae299cb7ca8dd006459b (diff) | |
| download | ffmpeg-33d77bc384676fc6b0ca51777519b001994d76df.tar.gz | |
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>
(cherry picked from commit eb9fb508b0e09d85d234fe694333b2005e1d7a7e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index da9642120c..0756d047ea 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1496,7 +1496,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) |