[SCM] libav/experimental: Move unaltered av_free() comments to the header file.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:57:21 UTC 2013
The following commit has been merged in the experimental branch:
commit f690ee715dcfb0d733affa10fc48661f60e1d5cc
Author: Panagiotis Issaris <takis.issaris at uhasselt.be>
Date: Mon Mar 5 13:50:03 2007 +0000
Move unaltered av_free() comments to the header file.
Originally committed as revision 8252 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/common.h b/libavutil/common.h
index 89f8a01..ab69eaf 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -344,6 +344,12 @@ void *av_malloc(unsigned int size);
* free(ptr) and NULL is returned.
*/
void *av_realloc(void *ptr, unsigned int size);
+
+/**
+ * Free memory which has been allocated with av_malloc(z)() or av_realloc().
+ * NOTE: ptr = NULL is explicetly allowed
+ * Note2: it is recommended that you use av_freep() instead
+ */
void av_free(void *ptr);
void *av_mallocz(unsigned int size);
diff --git a/libavutil/mem.c b/libavutil/mem.c
index c95892b..6a13d0e 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -111,11 +111,6 @@ void *av_realloc(void *ptr, unsigned int size)
#endif
}
-/**
- * Free memory which has been allocated with av_malloc(z)() or av_realloc().
- * NOTE: ptr = NULL is explicetly allowed
- * Note2: it is recommended that you use av_freep() instead
- */
void av_free(void *ptr)
{
/* XXX: this test should not be needed on most libcs */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list