Commit 2b15115f authored Jul 18, 2011 by Deckard Autoverifier Committed by Android Git Automerger Jul 18, 2011

am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright:...

am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '3ab6ccda':
  stagefright: Include stdlib.h for malloc/free

parents d1cada2a 3ab6ccda

media/libstagefright/codecs/common/cmnMemory.c

+1 −3

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