OSX: test and use frameworks correctly

[vlc] / modules / video_filter / dynamicoverlay / dynamicoverlay_list.c

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
index 06924fbb62f6926419fe832305263e2b3194da0a..ff620a5728420d48918993cece9640f8fb815330 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * dynamicoverlay_list.h : dynamic overlay list
  *****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008-2009 the VideoLAN team
  * $Id$
  *
- * Author: SÃ\83¸ren BÃ\83¸g <avacore@videolan.org>
+ * Author: Søren Bøg <avacore@videolan.org>
  *         Jean-Paul Saman <jpsaman@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_osd.h>
+#include <vlc_memory.h>
 
-#include <fcntl.h>
 #include "dynamicoverlay.h"
 
 /*****************************************************************************
@@ -38,13 +38,11 @@
 
 int ListInit( list_t *p_list )
 {
-    p_list->pp_head = malloc( 16 * sizeof( overlay_t * ) );
+    p_list->pp_head = calloc( 16, sizeof( overlay_t * ) );
     if( p_list->pp_head == NULL )
         return VLC_ENOMEM;
 
     p_list->pp_tail = p_list->pp_head + 16;
-    memset( p_list->pp_head, 0, 16 * sizeof( overlay_t * ) );
-
     return VLC_SUCCESS;
 }
 
@@ -82,8 +80,8 @@ ssize_t ListAdd( list_t *p_list, overlay_t *p_new )
     /* Have to expand */
     size_t i_size = p_list->pp_tail - p_list->pp_head;
     size_t i_newsize = i_size * 2;
-    p_list->pp_head = realloc( p_list->pp_head,
-                               i_newsize * sizeof( overlay_t * ) );
+    p_list->pp_head = realloc_or_free( p_list->pp_head,
+                                       i_newsize * sizeof( overlay_t * ) );
     if( p_list->pp_head == NULL )
         return VLC_ENOMEM;
 
@@ -132,7 +130,7 @@ overlay_t *ListWalk( list_t *p_list )
     for( ; pp_cur < p_list->pp_tail; ++pp_cur )
     {
         if( ( *pp_cur != NULL ) &&
-            ( (*pp_cur)->b_active == VLC_TRUE )&&
+            ( (*pp_cur)->b_active )&&
             ( (*pp_cur)->format.i_chroma != VLC_FOURCC( '\0','\0','\0','\0') ) )
         {
             return *pp_cur;