commit a4aef41a74a69b0296b88361ffb33d0470a26362
author Conley Owens <cco3@android.com> Mon Jul 18 16:53:41 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 18 16:53:41 2011 -0700
tree a876514d4675cf68488277d7d6038bf83353d49f
parent 2acddc54e1e7a9f41b4b5acc2e8984c46539425a
parent a74774fd9146aa22801487d3652dc18e9e328b8e

am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16

media/libstagefright/codecs/aacenc/src/bit_cnt.c

diff --git a/media/libstagefright/codecs/aacenc/src/bit_cnt.c b/media/libstagefright/codecs/aacenc/src/bit_cnt.c
index 510015a..9fe511cd 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;