commit 713468b9710b4cfb6e563c9f69e16a8a6372a5a4
author Martin Storsjo <martin@martin.st> Fri May 25 12:27:47 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 25 12:27:47 2012 -0700
tree 4f118cca8acc492b49e7d8e85f6d08b08aa2a06d
parent 342fdb573ae0ca387e72b615129fc34ad275ca30
parent f8321d624f4bbbfcf01d59f346d3eb390f75f24c

am f8321d62: stagefright aacenc: Fix reading out of bounds in pow2_xy

* commit 'f8321d624f4bbbfcf01d59f346d3eb390f75f24c':
  stagefright aacenc: Fix reading out of bounds in pow2_xy

media/libstagefright/codecs/aacenc/basic_op/oper_32b.c

diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c
index 982f4fd..cc01927 100644
--- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c
+++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c
@@ -344,8 +344,8 @@
 */
 Word32 pow2_xy(Word32 x, Word32 y)
 {
-  Word32 iPart;
-  Word32 fPart;
+  UWord32 iPart;
+  UWord32 fPart;
   Word32 res;
   Word32 tmp, tmp2;
   Word32 shift, shift2;