aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-01-25 22:59:05 +0000
committerDiego Biurrun <diego@biurrun.de>2009-01-25 22:59:05 +0000
commit1e60e933556a335dda598caed673e29480492d30 (patch)
treed494a8f9b4b1d463f2c411411f9bd2440186dfb6 /libavutil
parenta1a84f693f4bdfc191c2a621e5d0cd6f4355d36a (diff)
downloadffmpeg-1e60e933556a335dda598caed673e29480492d30.tar.gz
10l: Add #undefs for system free/malloc/realloc, which must be used here.
Originally committed as revision 16794 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/mem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 5413010680..251b1fadab 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -35,6 +35,11 @@
#include "mem.h"
+/* here we can use OS dependent allocation functions */
+#undef free
+#undef malloc
+#undef realloc
+
/* 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
linker will do it automatically */