From: Henrik Gramner <henrik@gramner.com>
Date: Thu, 10 Oct 2013 14:54:12 +0000 (+0200)
Subject: Replace gf_malloc with regular malloc in mp4 muxer
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b58a4ce52047b00f5892a9cdd92f9695a50a933;p=libx264

Replace gf_malloc with regular malloc in mp4 muxer

It was used as a workaround for a bug that only existed in the GPAC repository
for a few weeks back in 2010. There's no reason to keep it anymore.
---

diff --git a/configure b/configure
index 132e9e2a..bbf6721c 100755
--- a/configure
+++ b/configure
@@ -291,7 +291,7 @@ EXE=""
 
 # list of all preprocessor HAVE values we can define
 CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F VISUALIZE SWSCALE \
-             LAVF FFMS GPAC GF_MALLOC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP"
+             LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP"
 
 # parse options
 
@@ -948,9 +948,6 @@ if [ "$gpac" = "auto" ] ; then
 fi
 if [ "$gpac" = "yes" ] ; then
     define HAVE_GPAC
-    if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "void *p; p = gf_malloc(1); gf_free(p);" ; then
-        define HAVE_GF_MALLOC
-    fi
     LDFLAGSCLI="$GPAC_LIBS $LDFLAGSCLI"
 fi
 
diff --git a/output/mp4.c b/output/mp4.c
index bae4a58f..f5471b91 100644
--- a/output/mp4.c
+++ b/output/mp4.c
@@ -31,15 +31,6 @@
 #include <windows.h>
 #endif
 
-#if HAVE_GF_MALLOC
-#undef malloc
-#undef free
-#undef realloc
-#define malloc gf_malloc
-#define free gf_free
-#define realloc gf_realloc
-#endif
-
 typedef struct
 {
     GF_ISOFile *p_file;