From d6ff68ad853cab83cb58905b33a3957d249a75dd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 11 Jul 2015 23:58:39 +0200 Subject: Factor duplicated ff_fast_malloc() out into mem_internal.h internal.h is difficult to use due to circular dependancies mem.h is a public header ff_* is not public Alternative solutions probably are possible too Signed-off-by: Michael Niedermayer --- libavutil/mem.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'libavutil/mem.c') diff --git a/libavutil/mem.c b/libavutil/mem.c index d828cccb1a..323b18311b 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -59,6 +59,8 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ +#include "mem_internal.h" + #define ALIGN (HAVE_AVX ? 32 : 16) /* NOTE: if you want to override these functions with your own @@ -494,22 +496,6 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) return ptr; } -static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) -{ - void *val; - - if (min_size < *size) - return 0; - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); - av_freep(ptr); - val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); - memcpy(ptr, &val, sizeof(val)); - if (!val) - min_size = 0; - *size = min_size; - return 1; -} - void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) { ff_fast_malloc(ptr, size, min_size, 0); -- cgit v1.2.3