Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
This commit is contained in:
@ -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 */
|
||||||
);
|
);
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------
|
/*---------------------------------------------------------------------------
|
||||||
|
@ -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;
|
||||||
|
Reference in New Issue
Block a user