Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

Browse Source 
* commit 'e7650c327980f15c6cd53ad0081a54d78c3248f0':
  stagefright aacenc: Avoid warnings about incompatible pointer types
This commit is contained in:
Jean-Baptiste Queru
2012-02-24 09:48:14 -08:00
committed by Android Git Automerger
parent 7e8b65dfba e7650c3279
commit 459df4ef83
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/codecs/aacenc/inc/aacenc_core.h
View File

@@ -102,7 +102,7 @@ Word16 AacEncEncode(AAC_ENCODER *hAacEnc,
const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */ const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */
Word16 *numAncBytes, /*!< number of ancillary Data Bytes, send as fill element */ Word16 *numAncBytes, /*!< number of ancillary Data Bytes, send as fill element */
UWord8 *outBytes, /*!< pointer to output buffer */ UWord8 *outBytes, /*!< pointer to output buffer */
Word32 *numOutBytes /*!< number of bytes in output buffer */ VO_U32 *numOutBytes /*!< number of bytes in output buffer */
); );
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------

2
media/libstagefright/codecs/aacenc/src/aacenc_core.c
View File

@@ -146,7 +146,7 @@ Word16 AacEncEncode(AAC_ENCODER *aacEnc, /*!< an encoder handle */
const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */ const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */
Word16 *numAncBytes, /*!< number of 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) */ 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; ELEMENT_INFO *elInfo = &aacEnc->elInfo;