am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"

* commit '23cad6eb2b42f023a8f2197cd358de87f9084b99':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
This commit is contained in:
Jean-Baptiste Queru
2012-05-25 11:34:02 -07:00
committed by Android Git Automerger

View File

@@ -344,8 +344,8 @@ static const Word32 pow2Table[POW2_TABLE_SIZE] = {
*/
Word32 pow2_xy(Word32 x, Word32 y)
{
Word32 iPart;
Word32 fPart;
UWord32 iPart;
UWord32 fPart;
Word32 res;
Word32 tmp, tmp2;
Word32 shift, shift2;