diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:38:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:38:25 -0700 |
| commit | 3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0 (patch) | |
| tree | 951926865a1aaa2517df9f1c81e6b1d528d34a60 | |
| parent | af7e9726a19d106494e96078dedfda7baaeb59cd (diff) | |
| parent | e625479f58d7d9234c8ae7cb0c0a604bf43a9115 (diff) | |
| download | frameworks_av-3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0.zip frameworks_av-3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0.tar.gz frameworks_av-3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0.tar.bz2 | |
am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
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; |