[Ffmpeg-cvslog] r5784 - in trunk: libavcodec/Makefile libavcodec/avcodec.h libavcodec/mem.c libavutil/Makefile libavutil/common.h libavutil/mem.c

[lucabe]

Author: lucabe
Date: Wed Jul 19 09:28:58 2006
New Revision: 5784

Added:
   trunk/libavutil/mem.c
      - copied, changed from r5783, /trunk/libavcodec/mem.c
Removed:
   trunk/libavcodec/mem.c
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/avcodec.h
   trunk/libavutil/Makefile
   trunk/libavutil/common.h

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


Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Jul 19 09:28:58 2006
@@ -8,7 +8,7 @@
 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 \

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Wed Jul 19 09:28:58 2006
@@ -2597,10 +2597,7 @@
 
 
 /* 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);

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Wed Jul 19 09:28:58 2006
@@ -14,7 +14,8 @@
       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

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Wed Jul 19 09:28:58 2006
@@ -355,4 +355,9 @@
 #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 */

Copied: trunk/libavutil/mem.c (from r5783, /trunk/libavcodec/mem.c)
==============================================================================
--- /trunk/libavcodec/mem.c	(original)
+++ trunk/libavutil/mem.c	Wed Jul 19 09:28:58 2006
@@ -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