diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 09:52:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-24 09:52:54 -0800 |
| commit | d38faa28eb767a108a7a9467c1a481957531d2af (patch) | |
| tree | 9d39bc688b148c31a70b3bd6c43e87999690fb63 /media/libstagefright/codecs/aacenc/src | |
| parent | b20a352b7e4eb6690e86e0dcf9d58d73640dc874 (diff) | |
| parent | 142ce9a65b7505819e1205ad5bfa5d63843c7f43 (diff) | |
| download | frameworks_av-d38faa28eb767a108a7a9467c1a481957531d2af.zip frameworks_av-d38faa28eb767a108a7a9467c1a481957531d2af.tar.gz frameworks_av-d38faa28eb767a108a7a9467c1a481957531d2af.tar.bz2 | |
am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
stagefright aacenc: Avoid warnings about incompatible pointer types
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/aacenc_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |