From 7e27333a2b46a8aaa6c26b6162ca99b21ac1b5e6 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Tue, 25 May 2004 18:38:39 +0000
Subject: [PATCH] gst/ffmpegcolorspace/mem.c: malloc() is in stdlib.h, not
 malloc.h

Original commit message from CVS:
* gst/ffmpegcolorspace/mem.c:  malloc() is in stdlib.h, not malloc.h
---
 ChangeLog                  | 4 ++++
 gst/ffmpegcolorspace/mem.c | 9 +--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89e74943ce..40e589f503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  David Schleef  <ds@schleef.org>
+
+	* gst/ffmpegcolorspace/mem.c:  malloc() is in stdlib.h, not malloc.h
+
 2004-05-24  Benjamin Otte  <otte@gnome.org>
 
 	* ext/vorbis/oggvorbisenc.c: (gst_oggvorbisenc_sinkconnect),
diff --git a/gst/ffmpegcolorspace/mem.c b/gst/ffmpegcolorspace/mem.c
index 58862c418e..77c326aed1 100644
--- a/gst/ffmpegcolorspace/mem.c
+++ b/gst/ffmpegcolorspace/mem.c
@@ -28,14 +28,7 @@
 
 #include "avcodec.h"
 
-/* here we can use OS dependant allocation functions */
-#undef malloc
-#undef free
-#undef realloc
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 /* you can redefine av_malloc and av_free in your project to use your
    memory allocator. You do not need to suppress this file because the