Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"

2012-02-27 10:58:50 -08:00
parent 6a300a5413 51a50f01b5
commit 5aff259c61
1 changed files with 1 additions and 1 deletions
--- a/media/libstagefright/codecs/aacenc/src/sf_estim.c
+++ b/media/libstagefright/codecs/aacenc/src/sf_estim.c
@ -400,7 +400,7 @@ static void assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan,
                                Word16 *minScfCalculated,
                                Flag    restartOnSuccess)
 {
-	Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
+	Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
 	Word16 *scfLast, *scfNext;
 	Word32 sfbPeOld, sfbPeNew;
 	Word32 sfbDistNew;