diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:23:41 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-07-18 15:23:41 -0700 |
| commit | a77079f09897f27e97b073d3835fb4b62949a159 (patch) | |
| tree | b2c9be225f9c8008ccb26505b6eb111311fbd7ed /media/libstagefright/codecs/common | |
| parent | 24123b996366a20bedab4dffbc69c8e439fe04d3 (diff) | |
| parent | ea1b2a40def72caa03a40460bf04911b0d9b4d46 (diff) | |
| download | frameworks_av-a77079f09897f27e97b073d3835fb4b62949a159.zip frameworks_av-a77079f09897f27e97b073d3835fb4b62949a159.tar.gz frameworks_av-a77079f09897f27e97b073d3835fb4b62949a159.tar.bz2 | |
Merge "stagefright: Include stdlib.h for malloc/free"
Diffstat (limited to 'media/libstagefright/codecs/common')
| -rw-r--r-- | media/libstagefright/codecs/common/cmnMemory.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/common/cmnMemory.c b/media/libstagefright/codecs/common/cmnMemory.c index dd7c26d..aa52bd9 100644 --- a/media/libstagefright/codecs/common/cmnMemory.c +++ b/media/libstagefright/codecs/common/cmnMemory.c @@ -21,10 +21,8 @@ *******************************************************************************/ #include "cmnMemory.h" -#include <malloc.h> -#if defined LINUX +#include <stdlib.h> #include <string.h> -#endif //VO_MEM_OPERATOR g_memOP; |