diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 02:27:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 02:34:07 +0400 |
| commit | 85a3d20da55ff0eafff8ff6a3e52d52204fc6fd7 (patch) | |
| tree | 9f1ee64c89bd03f6ca21c29d835647d42dc3a511 /libavcodec/smacker.c | |
| parent | a4a2e894fca19e284c28a4114d7718bf5588dfa1 (diff) | |
| parent | f52edef30197735bfb937e9e723ab1e7b31165c6 (diff) | |
Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'
* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index f06d60fabd..f30d4b3089 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -257,7 +257,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int ctx.recode2 = tmp2.values; ctx.last = last; - huff.length = ((size + 3) >> 2) + 3; + huff.length = ((size + 3) >> 2) + 4; huff.maxlength = 0; huff.current = 0; huff.values = av_mallocz(huff.length * sizeof(int)); |