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

Jean-Baptiste Queru · android code review · commit 5aff259c61e5 · 2012-02-27T10:58:51.000-08:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ static void assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan,`
`400`	`400`	`Word16 *minScfCalculated,`
`401`	`401`	`Flag restartOnSuccess)`
`402`	`402`	`{`
`403`		`- Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin;`
	`403`	`+ Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin;`
`404`	`404`	`Word16 scfLast, scfNext;`
`405`	`405`	`Word32 sfbPeOld, sfbPeNew;`
`406`	`406`	`Word32 sfbDistNew;`