diff options
| author | Deckard Autoverifier <deckard@android.com> | 2011-07-18 15:46:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 15:46:26 -0700 |
| commit | d36635c4d90e8b891c7197a92370796635b7684c (patch) | |
| tree | 56b11858e0bfa1cac5f98f0fd9437c0d2703c04d /media/libstagefright/codecs | |
| parent | 8ebcf0222143b2b59d24946ef260894f367e096c (diff) | |
| parent | 0ab6faaca562abcb1d116824198388f5a3c8c73d (diff) | |
| download | frameworks_av-d36635c4d90e8b891c7197a92370796635b7684c.zip frameworks_av-d36635c4d90e8b891c7197a92370796635b7684c.tar.gz frameworks_av-d36635c4d90e8b891c7197a92370796635b7684c.tar.bz2 | |
am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
stagefright: Include stdlib.h for malloc/free
Diffstat (limited to 'media/libstagefright/codecs')
| -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; |