summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2010-12-22 22:33:03 +0100
committerMartin Storsjo <martin@martin.st>2012-01-30 12:59:03 +0200
commitcf8b805a0c0695097211ca18237c27f45b0df85c (patch)
tree1c3fa4d9b32c35e7adf6420a201c70061fa94b61
parent013b73bfc4d5fb21082ccccf45fa08c18f86aa08 (diff)
downloadframeworks_av-cf8b805a0c0695097211ca18237c27f45b0df85c.zip
frameworks_av-cf8b805a0c0695097211ca18237c27f45b0df85c.tar.gz
frameworks_av-cf8b805a0c0695097211ca18237c27f45b0df85c.tar.bz2
stagefright aacenc: Avoid warnings about incompatible pointer types
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
-rw-r--r--media/libstagefright/codecs/aacenc/inc/aacenc_core.h2
-rw-r--r--media/libstagefright/codecs/aacenc/src/aacenc_core.c2
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;