diff options
author | Conley Owens <cco3@android.com> | 2011-07-18 16:49:43 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-07-18 16:49:43 -0700 |
commit | d94bb8b524e09f978b6a16699b968628ff279208 (patch) | |
tree | e26b3b60a6baadc8faa85c27002f0db0eadab7fe /media/libstagefright/codecs/aacenc/src | |
parent | a77079f09897f27e97b073d3835fb4b62949a159 (diff) | |
parent | 99bc0510f9152fa88508a1ba1d2d158961fcefe0 (diff) | |
download | frameworks_av-d94bb8b524e09f978b6a16699b968628ff279208.zip frameworks_av-d94bb8b524e09f978b6a16699b968628ff279208.tar.gz frameworks_av-d94bb8b524e09f978b6a16699b968628ff279208.tar.bz2 |
Merge "stagefright aacenc: Mark codeWord as UWord16"
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src')
-rw-r--r-- | media/libstagefright/codecs/aacenc/src/bit_cnt.c | 2 |
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; |