diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 12:45:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 12:46:47 +0200 |
| commit | 534b2921028aad12d581c69ae425363ffe52df0d (patch) | |
| tree | 8b8b2fc5fe640cac8614b2350505705dc0cc6da5 /libavformat | |
| parent | 57b191b82ab2e46cb60d31f54219ea766ea57e29 (diff) | |
| parent | 8a96df7b70be509dae9ceec82d2c10a20361356d (diff) | |
Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'
* commit '8a96df7b70be509dae9ceec82d2c10a20361356d':
matroska: fix a corner case in ebml-lace parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 9d9fa6dfa2..17139acb3f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2025,7 +2025,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, case 0x3: /* EBML lacing */ { uint64_t num; - uint32_t total; + uint64_t total; n = matroska_ebmlnum_uint(matroska, data, size, &num); if (n < 0) { av_log(matroska->ctx, AV_LOG_INFO, |