summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-05 13:45:52 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-05 13:45:52 +0000
commit9a07029916629a7408d68c7a73fc989bf334ee1e (patch)
tree8839100eea889a2e9868f7d0bdf1f45b417b2296
parentbdd54e375815e9fe0742fd2f3653e58eac3e78fc (diff)
Move unaltered av_malloc() comments to the header file.
Originally committed as revision 8250 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavutil/common.h6
-rw-r--r--libavutil/mem.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index c5c88c1902..954cb5c06e 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -330,6 +330,12 @@ tend= read_time();\
#endif
/* memory */
+
+/**
+ * Memory allocation of size byte with alignment suitable for all
+ * memory accesses (including vectors if available on the
+ * CPU). av_malloc(0) must return a non NULL pointer.
+ */
void *av_malloc(unsigned int size);
void *av_realloc(void *ptr, unsigned int size);
void av_free(void *ptr);
diff --git a/libavutil/mem.c b/libavutil/mem.c
index fb0fb63e20..1a5d00a910 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -39,11 +39,6 @@
memory allocator. You do not need to suppress this file because the
linker will do it automatically */
-/**
- * Memory allocation of size byte with alignment suitable for all
- * memory accesses (including vectors if available on the
- * CPU). av_malloc(0) must return a non NULL pointer.
- */
void *av_malloc(unsigned int size)
{
void *ptr;