diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 09:45:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-24 09:45:40 -0800 |
| commit | 142ce9a65b7505819e1205ad5bfa5d63843c7f43 (patch) | |
| tree | 88f72f0a473bdedcb2512f579149f309ccdbb80e /media/libstagefright/codecs/aacenc/src | |
| parent | 9884ee5920da4976a4de809567ad8fcbe8608433 (diff) | |
| parent | ccdf9e6e3dc929a9ffee7ed2aab57115ef810527 (diff) | |
| download | frameworks_av-142ce9a65b7505819e1205ad5bfa5d63843c7f43.zip frameworks_av-142ce9a65b7505819e1205ad5bfa5d63843c7f43.tar.gz frameworks_av-142ce9a65b7505819e1205ad5bfa5d63843c7f43.tar.bz2 | |
am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
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; |