Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a09fe881 authored by Deckard Autoverifier's avatar Deckard Autoverifier Committed by Android Git Automerger
Browse files

am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc:... 

am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'd4dee1a5':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
parents e1928190 d4dee1a5

media/libstagefright/codecs/aacenc/src/memalign.c

+7 −2
Original line number Diff line number Diff line
@@ -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;