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

matroskadec: use uint64_t instead of int for index_scale

Browse Source 
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 eb9fb508b0)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2015-05-03 23:07:20 +02:00
committed by Andreas Cadhalpun
parent e6a5023d1f
commit 33d77bc384
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

@@ -1496,7 +1496,7 @@ static void matroska_add_index_entries(MatroskaDemuxContext *matroska)
{ {
EbmlList *index_list; EbmlList *index_list;
MatroskaIndex *index; MatroskaIndex *index;
int index_scale = 1; uint64_t index_scale = 1;
int i, j; int i, j;
if (matroska->ctx->flags & AVFMT_FLAG_IGNIDX) if (matroska->ctx->flags & AVFMT_FLAG_IGNIDX)