| commit | d94bb8b524e09f978b6a16699b968628ff279208 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 18 16:49:43 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Mon Jul 18 16:49:43 2011 -0700 |
| tree | e26b3b60a6baadc8faa85c27002f0db0eadab7fe | |
| parent | a77079f09897f27e97b073d3835fb4b62949a159 [diff] | |
| parent | 99bc0510f9152fa88508a1ba1d2d158961fcefe0 [diff] |
Merge "stagefright aacenc: Mark codeWord as UWord16"
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 @@ { Word32 i, t0, t1, t2, t3, t00, t01; - Word16 codeWord, codeLength; + UWord16 codeWord, codeLength; Word16 sign, signLength;