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 | 4d8f6a38e7268e29e189cb4173f42c7aa5b320a3 (patch) | |
| tree | cf189b456a6a3a6495e57e0eca7cce45917163af /media | |
| parent | 88409911aebed6c3663e51d51fca67f527c0c2fb (diff) | |
| parent | 9eb5d31a68bbf41ebd4144cf71f762c26f558438 (diff) | |
| download | frameworks_base-4d8f6a38e7268e29e189cb4173f42c7aa5b320a3.zip frameworks_base-4d8f6a38e7268e29e189cb4173f42c7aa5b320a3.tar.gz frameworks_base-4d8f6a38e7268e29e189cb4173f42c7aa5b320a3.tar.bz2 | |
Merge "stagefright aacenc: Mark codeWord as UWord16"
Diffstat (limited to 'media')
| -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; |