diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 09:20:36 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-24 09:20:37 -0800 |
| commit | ccdf9e6e3dc929a9ffee7ed2aab57115ef810527 (patch) | |
| tree | 76031c8576797b93322bfb46e5022ab0c5cffc88 /media/libstagefright/codecs/aacenc | |
| parent | aa1639aeb42e7c403315319bf55632de93d3c8d9 (diff) | |
| parent | cf8b805a0c0695097211ca18237c27f45b0df85c (diff) | |
| download | frameworks_av-ccdf9e6e3dc929a9ffee7ed2aab57115ef810527.zip frameworks_av-ccdf9e6e3dc929a9ffee7ed2aab57115ef810527.tar.gz frameworks_av-ccdf9e6e3dc929a9ffee7ed2aab57115ef810527.tar.bz2 | |
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/inc/aacenc_core.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/aacenc_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h index 1acdbbc..bb75b6d 100644 --- a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h +++ b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h @@ -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 */ ); /*--------------------------------------------------------------------------- diff --git a/media/libstagefright/codecs/aacenc/src/aacenc_core.c b/media/libstagefright/codecs/aacenc/src/aacenc_core.c index 2b3bd48..cecbc8f 100644 --- a/media/libstagefright/codecs/aacenc/src/aacenc_core.c +++ b/media/libstagefright/codecs/aacenc/src/aacenc_core.c @@ -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; |