summaryrefslogtreecommitdiff
path: root/libavutil/mem.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-12 21:17:26 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-19 19:04:28 +0200
commit490a022d86ef1c506a79744c5a95368af356fc69 (patch)
tree411f974cc5804db851793d62f6c9614ca2cee2cb /libavutil/mem.h
parent9e5c62c97fc0a6ee5764ec69cc6c237b5f70026b (diff)
lavu: remove misc disabled cruft
Diffstat (limited to 'libavutil/mem.h')
-rw-r--r--libavutil/mem.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h
index f52777b071..5dea492021 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -62,14 +62,6 @@
#define av_alloc_size(n)
#endif
-#if LIBAVUTIL_VERSION_MAJOR < 51
-# define FF_INTERNAL_MEM_TYPE unsigned int
-# define FF_INTERNAL_MEM_TYPE_MAX_VALUE UINT_MAX
-#else
-# define FF_INTERNAL_MEM_TYPE size_t
-# define FF_INTERNAL_MEM_TYPE_MAX_VALUE SIZE_MAX
-#endif
-
/**
* Allocate a block of size bytes with alignment suitable for all
* memory accesses (including vectors if available on the CPU).
@@ -78,7 +70,7 @@
* be allocated.
* @see av_mallocz()
*/
-void *av_malloc(FF_INTERNAL_MEM_TYPE size) av_malloc_attrib av_alloc_size(1);
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
/**
* Allocate or reallocate a block of memory.
@@ -92,7 +84,7 @@ void *av_malloc(FF_INTERNAL_MEM_TYPE size) av_malloc_attrib av_alloc_size(1);
* cannot be reallocated or the function is used to free the memory block.
* @see av_fast_realloc()
*/
-void *av_realloc(void *ptr, FF_INTERNAL_MEM_TYPE size) av_alloc_size(2);
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
/**
* Free a memory block which has been allocated with av_malloc(z)() or
@@ -112,7 +104,7 @@ void av_free(void *ptr);
* @return Pointer to the allocated block, NULL if it cannot be allocated.
* @see av_malloc()
*/
-void *av_mallocz(FF_INTERNAL_MEM_TYPE size) av_malloc_attrib av_alloc_size(1);
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
/**
* Duplicate the string s.