commit 8ebe5be6b0b3caa7d9d6277a1216ed786bd1e66a
author Conley Owens <cco3@android.com> Mon Jul 18 16:57:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 18 16:57:04 2011 -0700
tree 19ec47d33d6848a88a9e3f9451f07c4efc5d5bd4
parent d36635c4d90e8b891c7197a92370796635b7684c
parent b2ac59b3a1748eef58c228a7e808d40bd1741dcf

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

* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  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 dd0b9b4..8853efc 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;