Changeset bb352cd558ddf3729b06511bddd002c922c05914

Timestamp:

25/01/08 17:38:14 (9 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1201279094 +0000

git-parent:

[0370021454ba3f18bf12bb8d3426cf0fcabece7c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1201279094 +0000

Message:

Privatize the memalign replacement

Files:

• include/vlc_common.h (modified) (1 diff)
• modules/gui/macosx/voutqt.m (modified) (3 diffs)
• src/video_output/vout_pictures.h (modified) (1 diff)

include/vlc_common.h

@@ -819 +819 @@
-#define VLC_UNUSED(x) (void)(x)
-
-/* Alignment of critical dynamic data structure
- *
- * Not all platforms support memalign so we provide a vlc_memalign wrapper
- * void *vlc_memalign( size_t align, size_t size, void **pp_orig )
- * *pp_orig is the pointer that has to be freed afterwards.
- */
-#if 0
-#ifdef HAVE_POSIX_MEMALIGN
-#   define vlc_memalign(align,size,pp_orig) \
-    ( !posix_memalign( pp_orig, align, size ) ? *(pp_orig) : NULL )
-#endif
-#endif
-#ifdef HAVE_MEMALIGN
-    /* Some systems have memalign() but no declaration for it */
-    void * memalign( size_t align, size_t size );
-
-#   define vlc_memalign(pp_orig,align,size) \
-    ( *(pp_orig) = memalign( align, size ) )
-
-#else /* We don't have any choice but to align manually */
-#   define vlc_memalign(pp_orig,align,size) \
-    (( *(pp_orig) = malloc( size + align - 1 )) \
-        ? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \
-                       & (~(unsigned long)(align-1)) ) \
-        : NULL )
-
-#endif
-
-/* Stuff defined in src/extras/libc.c */
-#ifndef HAVE_STRDUP

modules/gui/macosx/voutqt.m

@@ -30 +30 @@
- * Preamble
- *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <stdlib.h>                                                /* free() */
-#include <string.h>
+#include <assert.h>
-
-#include <QuickTime/QuickTime.h>
@@ -705 +705 @@
-
-            /* Allocate the memory buffer */
-
-
+
+
+
+
+
-
-            p_pic->p[0].p_pixels = p_pic->p_data;
@@ -725 +728 @@
- 
-            /* Allocate the memory buffer */
-
-
+
+
+
+
+
+
-
-            /* Y buffer */

src/video_output/vout_pictures.h

@@ -103 +103 @@
-/* Planar 8-bit grayscale */
-#define FOURCC_GREY         VLC_FOURCC('G','R','E','Y')
+
+/* Alignment of critical dynamic data structure
+ *
+ * Not all platforms support memalign so we provide a vlc_memalign wrapper
+ * void *vlc_memalign( size_t align, size_t size, void **pp_orig )
+ * *pp_orig is the pointer that has to be freed afterwards.
+ */
+#if 0
+#ifdef HAVE_POSIX_MEMALIGN
+#   define vlc_memalign(align,size,pp_orig) \
+    ( !posix_memalign( pp_orig, align, size ) ? *(pp_orig) : NULL )
+#endif
+#endif
+#ifdef HAVE_MEMALIGN
+    /* Some systems have memalign() but no declaration for it */
+    void * memalign( size_t align, size_t size );
+
+#   define vlc_memalign(pp_orig,align,size) \
+    ( *(pp_orig) = memalign( align, size ) )
+
+#else /* We don't have any choice but to align manually */
+#   define vlc_memalign(pp_orig,align,size) \
+    (( *(pp_orig) = malloc( size + align - 1 )) \
+        ? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \
+                       & (~(unsigned long)(align-1)) ) \
+        : NULL )
+
+#endif
+