Use config_GetUserDataDir() internally

[vlc] / src / video_output / vout_pictures.h

diff --git a/src/video_output/vout_pictures.h b/src/video_output/vout_pictures.h
index 452f110af99ee7f7d18b9a78bb417f8293d81e89..518e6c5cf1fd505508dabff412b26fc656b6311a 100644 (file)
--- a/src/video_output/vout_pictures.h
+++ b/src/video_output/vout_pictures.h
@@ -109,35 +109,27 @@
  * void *vlc_memalign( size_t align, size_t size, void **pp_orig )
  * *pp_orig is the pointer that has to be freed afterwards.
  */
-#if defined (HAVE_POSIX_MEMALIGN)
 static inline
-void *vlc_memalign (size_t align, size_t size, void **pp)
+void *vlc_memalign (void **pp, size_t align, size_t size)
 {
+#if defined (HAVE_POSIX_MEMALIGN)
     return posix_memalign (pp, align, size) ? NULL : *pp;
-}
 #elif defined (HAVE_MEMALIGN)
-static inline
-void *vlc_memalign (size_t align, size_t size, void **pp)
-{
     return *pp = memalign (align, size);
-}
-#else /* We don't have any choice but to align manually */
-static inline
-void *vlc_memalign (size_t align, size_t size, void **pp)
-{
+#else
     unsigned char *ptr;
 
     if (align < 1)
         return NULL;
 
     align--;
-    ptr = malloc (size + --align);
+    ptr = malloc (size + align);
     if (ptr == NULL)
         return NULL;
 
     *pp = ptr;
     ptr += align;
     return (void *)(((uintptr_t)ptr) & ~align);
-}
 #endif
+}