summaryrefslogtreecommitdiff
path: root/libavutil/mem.c
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.c
parent9e5c62c97fc0a6ee5764ec69cc6c237b5f70026b (diff)
lavu: remove misc disabled cruft
Diffstat (limited to 'libavutil/mem.c')
-rw-r--r--libavutil/mem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 7a54bd0f7e..2aef9b0a1b 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -61,7 +61,7 @@ void free(void *ptr);
memory allocator. You do not need to suppress this file because the
linker will do it automatically. */
-void *av_malloc(FF_INTERNAL_MEM_TYPE size)
+void *av_malloc(size_t size)
{
void *ptr = NULL;
#if CONFIG_MEMALIGN_HACK
@@ -116,7 +116,7 @@ void *av_malloc(FF_INTERNAL_MEM_TYPE size)
return ptr;
}
-void *av_realloc(void *ptr, FF_INTERNAL_MEM_TYPE size)
+void *av_realloc(void *ptr, size_t size)
{
#if CONFIG_MEMALIGN_HACK
int diff;
@@ -153,7 +153,7 @@ void av_freep(void *arg)
*ptr = NULL;
}
-void *av_mallocz(FF_INTERNAL_MEM_TYPE size)
+void *av_mallocz(size_t size)
{
void *ptr = av_malloc(size);
if (ptr)