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

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

am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc:... 

am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit '4de803c7':
  stagefright aacenc: Avoid warnings about incompatible pointer types
parents 39490617 4de803c7

media/libstagefright/codecs/aacenc/inc/aacenc_core.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Word16 AacEncEncode(AAC_ENCODER *hAacEnc, 
                    const UWord8       *ancBytes,      /*!< pointer to ancillary data bytes */

                    Word16             *numAncBytes,   /*!< number of ancillary Data Bytes, send as fill element  */

                    UWord8             *outBytes,      /*!< pointer to output buffer            */

                    Word32             *numOutBytes    /*!< number of bytes in output buffer */

                    VO_U32             *numOutBytes    /*!< number of bytes in output buffer */

                    );



/*---------------------------------------------------------------------------

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ Word16 AacEncEncode(AAC_ENCODER *aacEnc, /*!< an encoder handle */ 
                    const UWord8 *ancBytes,     /*!< pointer to ancillary data bytes */

                    Word16 *numAncBytes,		/*!< number of ancillary Data Bytes */

                    UWord8 *outBytes,           /*!< pointer to output buffer (must be large MINBITS_COEF/8*MAX_CHANNELS bytes) */

                    Word32 *numOutBytes         /*!< number of bytes in output buffer after processing */

                    VO_U32 *numOutBytes         /*!< number of bytes in output buffer after processing */

                    )

{

  ELEMENT_INFO *elInfo = &aacEnc->elInfo;