From: Rafaël Carré <funman@videolan.org>
Date: Wed, 18 Jan 2012 01:35:45 +0000 (-0500)
Subject: dynamic overlay: prefix some functions with do_
X-Git-Tag: 2.1.0-git~6253
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e7211c9a48bed2fd345dfac5c33c7f59445ee613;hp=dbedba79a4c61d3ea609a94afa07f4a7ddbf2d59;p=vlc

dynamic overlay: prefix some functions with do_

The symbols clash with libthreadutil of upnp
---

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index c7079a0db2..b9562a6901 100644
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this )
     QueueInit( &p_sys->atomic );
     QueueInit( &p_sys->pending );
     QueueInit( &p_sys->processed );
-    ListInit( &p_sys->overlays );
+    do_ListInit( &p_sys->overlays );
 
     p_sys->i_inputfd = -1;
     p_sys->i_outputfd = -1;
@@ -146,7 +146,7 @@ static void Destroy( vlc_object_t *p_this )
     QueueDestroy( &p_sys->atomic );
     QueueDestroy( &p_sys->pending );
     QueueDestroy( &p_sys->processed );
-    ListDestroy( &p_sys->overlays );
+    do_ListDestroy( &p_sys->overlays );
     UnregisterCommand( p_filter );
 
     var_DelCallback( p_filter, "overlay-input", AdjustCallback, p_sys );
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.h b/modules/video_filter/dynamicoverlay/dynamicoverlay.h
index 3995acec9e..d8cc8daf36 100644
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.h
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.h
@@ -153,8 +153,8 @@ typedef struct list_t
     overlay_t **pp_head, **pp_tail;
 } list_t;
 
-int ListInit( list_t *p_list );
-int ListDestroy( list_t *p_list );
+int do_ListInit( list_t *p_list );
+int do_ListDestroy( list_t *p_list );
 ssize_t ListAdd( list_t *p_list, overlay_t *p_new );
 int ListRemove( list_t *p_list, size_t i_idx );
 overlay_t *ListGet( list_t *p_list, size_t i_idx );
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
index 0ebc856d8a..03d64c81d1 100644
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
@@ -36,7 +36,7 @@
  * list_t: Command queue
  *****************************************************************************/
 
-int ListInit( list_t *p_list )
+int do_ListInit( list_t *p_list )
 {
     p_list->pp_head = calloc( 16, sizeof( overlay_t * ) );
     if( p_list->pp_head == NULL )
@@ -46,7 +46,7 @@ int ListInit( list_t *p_list )
     return VLC_SUCCESS;
 }
 
-int ListDestroy( list_t *p_list )
+int do_ListDestroy( list_t *p_list )
 {
     for( overlay_t **pp_cur = p_list->pp_head;
          pp_cur < p_list->pp_tail;