diff options
| author | Martin Storsjo <martin@martin.st> | 2010-12-22 22:16:35 +0100 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2011-06-22 21:54:25 +0300 |
| commit | 267dbd822ff060843ce409c0f1b50f6d5468ea31 (patch) | |
| tree | c90413ae917f88cee199859f85cbe6a7a5091d16 /media/libstagefright/codecs | |
| parent | 2c32a92c84445d312b0dee4c82f84c036f2ca651 (diff) | |
| download | frameworks_av-267dbd822ff060843ce409c0f1b50f6d5468ea31.zip frameworks_av-267dbd822ff060843ce409c0f1b50f6d5468ea31.tar.gz frameworks_av-267dbd822ff060843ce409c0f1b50f6d5468ea31.tar.bz2 | |
stagefright aacenc: Make the mem_malloc function 64-bit safe
Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
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; |