Commit ddfe4124 authored by Yusuke Nakamura's avatar Yusuke Nakamura Committed by Fiona Glaser

Fix link errors with newest gpac cvs

gpac decided to randomly break API and require us to use their own custom malloc and free.
parent 2a2db86d
......@@ -597,6 +597,9 @@ if [ "$mp4_output" = "auto" ] ; then
fi
if [ "$mp4_output" = "yes" ] ; then
define MP4_OUTPUT
if cc_check gpac/isomedia.h "-Werror $MP4_LDFLAGS" "gf_malloc(1); gf_free(NULL);" ; then
define HAVE_GF_MALLOC
fi
LDFLAGSCLI="$LDFLAGSCLI $MP4_LDFLAGS"
fi
......
......@@ -24,6 +24,13 @@
#include "muxers.h"
#include <gpac/isomedia.h>
#ifdef HAVE_GF_MALLOC
#undef malloc
#undef free
#define malloc gf_malloc
#define free gf_free
#endif
typedef struct
{
GF_ISOFile *p_file;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment