diff options
| author | Martin Storsjo <martin@martin.st> | 2010-12-22 22:09:51 +0100 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-01-13 20:57:09 +0200 |
| commit | 417f62c84261ea17e17a011b1e9706eb997a6ba1 (patch) | |
| tree | 2cf817cb06baf609e4ce01623a85ad7038d5e909 /media/libstagefright/codecs/amrwbenc/src | |
| parent | b676a05348e4c516fa8b57e33b10548e6142c3f8 (diff) | |
| download | frameworks_av-417f62c84261ea17e17a011b1e9706eb997a6ba1.zip frameworks_av-417f62c84261ea17e17a011b1e9706eb997a6ba1.tar.gz frameworks_av-417f62c84261ea17e17a011b1e9706eb997a6ba1.tar.bz2 | |
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/src')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/mem_align.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/mem_align.c b/media/libstagefright/codecs/amrwbenc/src/mem_align.c index a29baf3..3b7853f 100644 --- a/media/libstagefright/codecs/amrwbenc/src/mem_align.c +++ b/media/libstagefright/codecs/amrwbenc/src/mem_align.c @@ -23,6 +23,11 @@ #include "mem_align.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; |