diff options
| author | 2011-07-18 15:46:26 -0700 | |
|---|---|---|
| committer | 2011-07-18 15:46:26 -0700 | |
| commit | 2b15115fee072bf82e8d0b99c6cf2a2525c49a01 (patch) | |
| tree | ef89670f94e4adfe943c5586f61b85cdde96b9f3 | |
| parent | d1cada2ad82d0ff9ffdb747747361aeba72ed1b4 (diff) | |
| parent | 3ab6ccda447c605c35c8854a2ec8c49c2a0653a6 (diff) | |
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
| -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 dd7c26d55a5a..aa52bd98f070 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; |