diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:41:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:41:26 -0700 |
| commit | 29fd8cdbe554ca65c57dd9eea59dc57e3392acc3 (patch) | |
| tree | 8a4bf2ef520fd9a278c0ce0f61b45d6f04253f9a | |
| parent | 691257b1812ffd8172b01c17b9ba23a48eb76594 (diff) | |
| parent | 80ef1745d00c235b117e389e56e58210cf88e5c8 (diff) | |
| download | frameworks_base-29fd8cdbe554ca65c57dd9eea59dc57e3392acc3.zip frameworks_base-29fd8cdbe554ca65c57dd9eea59dc57e3392acc3.tar.gz frameworks_base-29fd8cdbe554ca65c57dd9eea59dc57e3392acc3.tar.bz2 | |
am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
stagefright aacenc: Make the mem_malloc function 64-bit safe
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/memalign.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/memalign.c b/media/libstagefright/codecs/aacenc/src/memalign.c index 1818c4b..bb266dc 100644 --- a/media/libstagefright/codecs/aacenc/src/memalign.c +++ b/media/libstagefright/codecs/aacenc/src/memalign.c @@ -23,6 +23,11 @@ #include "memalign.h" +#ifdef _MSC_VER +#include <stddef.h> +#else +#include <stdint.h> +#endif /***************************************************************************** * @@ -66,8 +71,8 @@ mem_malloc(VO_MEM_OPERATOR *pMemop, unsigned int size, unsigned char alignment, pMemop->Set(CodecID, tmp, 0, size + alignment); mem_ptr = - (unsigned char *) ((unsigned int) (tmp + alignment - 1) & - (~((unsigned int) (alignment - 1)))); + (unsigned char *) ((intptr_t) (tmp + alignment - 1) & + (~((intptr_t) (alignment - 1)))); if (mem_ptr == tmp) mem_ptr += alignment; |