aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-30 00:05:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:54:48 +0200
commit107ea3057eb8de8a38c45c2f7181c42ea694b187 (patch)
treeef9352b1edd0486849018bc8d1a7a50ddadd65ed
parent375bd0cfb3d7b86bd5f70d1bc2d15bbd44e3abfe (diff)
downloadffmpeg-107ea3057eb8de8a38c45c2f7181c42ea694b187.tar.gz
Fix out of bound writes in fix_bitshift() of the shorten decoder.
The data pointers s->decoded[*] already take into account s->nwrap. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f42b3195d3f2692a4dfc0a8668bb4ac35301f2ed)
-rw-r--r--libavcodec/shorten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index f593d0a164..5e599fd504 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -155,7 +155,7 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer)
if (s->bitshift != 0)
for (i = 0; i < s->blocksize; i++)
- buffer[s->nwrap + i] <<= s->bitshift;
+ buffer[i] <<= s->bitshift;
}