summaryrefslogtreecommitdiff
path: root/libavutil/mem.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-12-04 04:00:12 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-12-04 04:00:12 +0000
commitb47541c7a38de186e85f728fd54f1a9ec6b88688 (patch)
tree7ab57e145d8eb6a5f147de9bf1310c0fa0df804c /libavutil/mem.c
parent5bdbf64cf346e5558fe1920ff6cd06ae1f646a3c (diff)
Change the argument of memory allocation functions from unsigned int to size_t
with the next major bump in libavutil. Originally committed as revision 25871 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 8cad089a7d..18fe28b7ce 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(unsigned int size)
+void *av_malloc(FF_INTERNAL_MEM_TYPE size)
{
void *ptr = NULL;
#if CONFIG_MEMALIGN_HACK
@@ -116,7 +116,7 @@ void *av_malloc(unsigned int size)
return ptr;
}
-void *av_realloc(void *ptr, unsigned int size)
+void *av_realloc(void *ptr, FF_INTERNAL_MEM_TYPE size)
{
#if CONFIG_MEMALIGN_HACK
int diff;
@@ -154,7 +154,7 @@ void av_freep(void *arg)
*ptr = NULL;
}
-void *av_mallocz(unsigned int size)
+void *av_mallocz(FF_INTERNAL_MEM_TYPE size)
{
void *ptr = av_malloc(size);
if (ptr)