diff options
| author | Conley Owens <cco3@android.com> | 2011-07-18 16:53:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 16:53:41 -0700 |
| commit | a4aef41a74a69b0296b88361ffb33d0470a26362 (patch) | |
| tree | a876514d4675cf68488277d7d6038bf83353d49f /media | |
| parent | 2acddc54e1e7a9f41b4b5acc2e8984c46539425a (diff) | |
| parent | a74774fd9146aa22801487d3652dc18e9e328b8e (diff) | |
| download | frameworks_base-a4aef41a74a69b0296b88361ffb33d0470a26362.zip frameworks_base-a4aef41a74a69b0296b88361ffb33d0470a26362.tar.gz frameworks_base-a4aef41a74a69b0296b88361ffb33d0470a26362.tar.bz2 | |
am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
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; |