From 656bb978b3b85eb68849c0bc4170af1bc63fc442 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 22 Dec 2010 22:09:51 +0100 Subject: stagefright amrwbenc: Make the mem_malloc function 64-bit safe Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6 --- media/libstagefright/codecs/amrwbenc/src/mem_align.c | 9 +++++++-- 1 file 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 a29baf3830b3..3b7853f19854 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 +#else +#include +#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; -- cgit v1.2.3-59-g8ed1b