Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0502b93 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc:... 

am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
parents df712ea8 7917b452

media/libstagefright/codecs/aacenc/src/sf_estim.c

+1 −1
Original line number Diff line number Diff line
@@ -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;