[vlc-commits] Remove vlc_free()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jun 19 22:39:47 2017 +0300| [c892276f7239c8e880d306b1778ff7864251f413] | committer: Rémi Denis-Courmont

Remove vlc_free()

free() is required by ISO C (hosted) and C++ anyway.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c892276f7239c8e880d306b1778ff7864251f413
---

 include/vlc_common.h           | 3 ---
 modules/video_chroma/copy.c    | 2 +-
 modules/video_filter/gradfun.c | 2 +-
 src/misc/picture.c             | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 0bfb1b9b04..35655b1299 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -849,13 +849,10 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t )
 
 #ifdef __MINGW32__
 # define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
-# define vlc_free(base)            (__mingw_aligned_free(base))
 #elif defined(_MSC_VER)
 # define vlc_memalign(align, size) (_aligned_malloc(size, align))
-# define vlc_free(base)            (_aligned_free(base))
 #else
 # define vlc_memalign(align, size) aligned_alloc(align, size)
-# define vlc_free(base) free(base)
 #endif
 
 /*****************************************************************************
diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index 6238ffb1ab..5b785414b3 100644
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -49,7 +49,7 @@ int CopyInitCache(copy_cache_t *cache, unsigned width)
 void CopyCleanCache(copy_cache_t *cache)
 {
 #ifdef CAN_COMPILE_SSE2
-    vlc_free(cache->buffer);
+    free(cache->buffer);
     cache->buffer = NULL;
     cache->size   = 0;
 #else
diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 88c9b1ebf5..f356d13b89 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -168,7 +168,7 @@ static void Close(vlc_object_t *object)
 
     var_DelCallback(filter, CFG_PREFIX "radius",   Callback, NULL);
     var_DelCallback(filter, CFG_PREFIX "strength", Callback, NULL);
-    vlc_free(sys->cfg.buf);
+    free(sys->cfg.buf);
     vlc_mutex_destroy(&sys->lock);
     free(sys);
 }
diff --git a/src/misc/picture.c b/src/misc/picture.c
index 0cb251255b..d7d6c7ae47 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -110,7 +110,7 @@ static void picture_DestroyFromResource( picture_t *p_picture )
  */
 static void picture_Destroy( picture_t *p_picture )
 {
-    vlc_free( p_picture->p[0].p_pixels );
+    free( p_picture->p[0].p_pixels );
     free( p_picture );
 }