From 44f27b3a86d2c8847e4fd5a74d9d157c579725cf Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Sat, 18 May 2002 22:56:25 +0000 Subject: [PATCH] added proper memory handling functions - fixed include paths Originally committed as revision 516 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/common.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/common.h b/libavcodec/common.h index 38379a4..5494555 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -17,18 +17,19 @@ #ifdef HAVE_AV_CONFIG_H /* only include the following when compiling package */ -#include "../config.h" +#include "config.h" #include #include #include #include +#include #ifndef ENODATA #define ENODATA 61 #endif -#endif +#endif /* HAVE_AV_CONFIG_H */ #ifdef CONFIG_WIN32 @@ -121,7 +122,7 @@ typedef signed long long INT64; #define UINT64_C(c) (c ## ULL) #endif -#include "../bswap.h" +#include "bswap.h" #ifdef USE_FASTMEMCPY #include "fastmemcpy.h" @@ -897,7 +898,10 @@ static inline int clip(int a, int amin, int amax) } /* memory */ +void *av_malloc(int size); void *av_mallocz(int size); +void av_free(void *ptr); +#define av_freep(p) do { av_free(*p); *p = NULL; } while (0) /* math */ int ff_gcd(int a, int b); -- 2.7.4