summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2011-04-21 12:57:40 +0300
committerMartin Storsjo <martin@martin.st>2011-04-23 19:22:30 +0300
commit99bc0510f9152fa88508a1ba1d2d158961fcefe0 (patch)
tree287319f74c40800d62fe1d4aa89bc3cebb46b7cd /media/libstagefright/codecs
parentf3664ae9369a861ffbc2354e8e93e48983802062 (diff)
downloadframeworks_av-99bc0510f9152fa88508a1ba1d2d158961fcefe0.zip
frameworks_av-99bc0510f9152fa88508a1ba1d2d158961fcefe0.tar.gz
frameworks_av-99bc0510f9152fa88508a1ba1d2d158961fcefe0.tar.bz2
stagefright aacenc: Mark codeWord as UWord16
Without this, the codeword 0xffff will be expanded to 0xffffffff when passed as a Word32 parameter. All code words set into this variable are UWord16 initially. When it was expanded to 0xffffffff, it could accidentally overwrite earlier cached bits in the bitstream writer. Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/aacenc/src/bit_cnt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/bit_cnt.c b/media/libstagefright/codecs/aacenc/src/bit_cnt.c
index 510015a..9fe511c 100644
--- a/media/libstagefright/codecs/aacenc/src/bit_cnt.c
+++ b/media/libstagefright/codecs/aacenc/src/bit_cnt.c
@@ -496,7 +496,7 @@ Word16 codeValues(Word16 *values, Word16 width, Word16 codeBook, HANDLE_BIT_BUF
{
Word32 i, t0, t1, t2, t3, t00, t01;
- Word16 codeWord, codeLength;
+ UWord16 codeWord, codeLength;
Word16 sign, signLength;