Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5784 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4e2aea33c06b8961f274fdb86a311c8d0553490e..76d996d161889bb6a044e06e9635d90ce250aae9 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -8,7 +8,7 @@ include ../config.mak
 CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS)
 
-OBJS= bitstream.o utils.o mem.o allcodecs.o \
+OBJS= bitstream.o utils.o allcodecs.o \
       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
       mjpeg.o resample.o resample2.o dsputil.o \
       motion_est.o imgconvert.o imgresample.o \

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b37e31d5aae753b2d9fa62544fbe2479bb16b290..1c0d1ea66b303b8ebd35d1e0cbd8648b2a71e750 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2597,10 +2597,7 @@ extern AVBitStreamFilter noise_bsf;
 
 
 /* memory */
-void *av_malloc(unsigned int size);
 void *av_mallocz(unsigned int size);
-void *av_realloc(void *ptr, unsigned int size);
-void av_free(void *ptr);
 char *av_strdup(const char *s);
 void av_freep(void *ptr);
 void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);

diff --git a/libavutil/Makefile b/libavutil/Makefile
index dfcc6eab9fb90810c1e6e32a8c54761f1119ebda..506a9e1809ccb109eb560816e5a36a8f05cd5047 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -14,7 +14,8 @@ OBJS= mathematics.o \
       md5.o \
       lls.o \
       adler32.o \
-      log.o
+      log.o \
+      mem.o \
 
 HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
           intfloat_readwrite.h md5.h adler32.h

diff --git a/libavutil/common.h b/libavutil/common.h
index fe7ff571b3b7aa4a88fc2a329946c3fcd3855138..4a92cd31cc168b7f79ca6c83a84d065ef84490aa 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -355,4 +355,9 @@ tend= read_time();\
 #define STOP_TIMER(id) {}
 #endif
 
+/* memory */
+void *av_malloc(unsigned int size);
+void *av_realloc(void *ptr, unsigned int size);
+void av_free(void *ptr);
+
 #endif /* COMMON_H */

diff --git a/libavcodec/mem.c b/libavutil/mem.c
similarity index 97%
rename from libavcodec/mem.c
rename to libavutil/mem.c
index f9be906be70afbb4f75c83036c3f99948adff059..440328b7f1d5e86095a71166522b7772e8b9ac31 100644 (file)
--- a/libavcodec/mem.c
+++ b/libavutil/mem.c
@@ -1,5 +1,5 @@
 /*
- * default memory allocator for libavcodec
+ * default memory allocator for libavutil
  * Copyright (c) 2002 Fabrice Bellard.
  *
  * This library is free software; you can redistribute it and/or
@@ -19,10 +19,10 @@
 
 /**
  * @file mem.c
- * default memory allocator for libavcodec.
+ * default memory allocator for libavutil.
  */
 
-#include "avcodec.h"
+#include "common.h"
 
 /* here we can use OS dependant allocation functions */
 #undef malloc