diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:46:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:46:18 -0700 |
| commit | 7b9bcbb0975049c05c3b4a4048802807433ace42 (patch) | |
| tree | bf24958fbeab05b70fb7a7de5af42282c6c5f0e7 /media/libstagefright/codecs | |
| parent | bb29abfe798e0a3329380481834e5839db141902 (diff) | |
| parent | 54b0ae0dc7ba9be652285250f4976d8db89c30ee (diff) | |
| download | frameworks_av-7b9bcbb0975049c05c3b4a4048802807433ace42.zip frameworks_av-7b9bcbb0975049c05c3b4a4048802807433ace42.tar.gz frameworks_av-7b9bcbb0975049c05c3b4a4048802807433ace42.tar.bz2 | |
am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Diffstat (limited to 'media/libstagefright/codecs')
| -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 7d20352..44dd4ba 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; |