diff options
author | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2007-03-05 13:46:47 +0000 |
---|---|---|
committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2007-03-05 13:46:47 +0000 |
commit | d6def91a3bcd08af9baf162577954c92cf4e8886 (patch) | |
tree | 5fa1f37459cff75d370453f35d59a546560bbd4a /libavutil | |
parent | 9a07029916629a7408d68c7a73fc989bf334ee1e (diff) | |
download | ffmpeg-d6def91a3bcd08af9baf162577954c92cf4e8886.tar.gz |
Move unaltered av_realloc() comments to the header file.
Originally committed as revision 8251 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/common.h | 6 | ||||
-rw-r--r-- | libavutil/mem.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 954cb5c06e..89f8a01f52 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -337,6 +337,12 @@ tend= read_time();\ * CPU). av_malloc(0) must return a non NULL pointer. */ void *av_malloc(unsigned int size); + +/** + * av_realloc semantics (same as glibc): if ptr is NULL and size > 0, + * identical to malloc(size). If size is zero, it is identical to + * free(ptr) and NULL is returned. + */ void *av_realloc(void *ptr, unsigned int size); void av_free(void *ptr); diff --git a/libavutil/mem.c b/libavutil/mem.c index 1a5d00a910..c95892b361 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -91,11 +91,6 @@ void *av_malloc(unsigned int size) return ptr; } -/** - * av_realloc semantics (same as glibc): if ptr is NULL and size > 0, - * identical to malloc(size). If size is zero, it is identical to - * free(ptr) and NULL is returned. - */ void *av_realloc(void *ptr, unsigned int size) { #ifdef CONFIG_MEMALIGN_HACK |