Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

Browse Source
This commit is contained in:
Deckard Autoverifier
2011-07-18 15:23:20 -07:00
committed by Android Code Review
parent 55f115a321 a9de2b598d
commit c06c3603e0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/libstagefright/codecs/aacenc/src/memalign.c
View File

@@ -23,6 +23,11 @@
#include "memalign.h" #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); pMemop->Set(CodecID, tmp, 0, size + alignment);
mem_ptr = mem_ptr =
(unsigned char *) ((unsigned int) (tmp + alignment - 1) & (unsigned char *) ((intptr_t) (tmp + alignment - 1) &
(~((unsigned int) (alignment - 1)))); (~((intptr_t) (alignment - 1))));
if (mem_ptr == tmp) if (mem_ptr == tmp)
mem_ptr += alignment; mem_ptr += alignment;