vlc | branch: master | Rafaël Carré <[email protected]> | Tue Jan 17 20:35:45 2012 -0500| [e7211c9a48bed2fd345dfac5c33c7f59445ee613] | committer: Rafaël Carré
dynamic overlay: prefix some functions with do_ The symbols clash with libthreadutil of upnp > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7211c9a48bed2fd345dfac5c33c7f59445ee613 --- .../video_filter/dynamicoverlay/dynamicoverlay.c | 4 ++-- .../video_filter/dynamicoverlay/dynamicoverlay.h | 4 ++-- .../dynamicoverlay/dynamicoverlay_list.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index c7079a0..b9562a6 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 3995ace..d8cc8da 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 0ebc856..03d64c8 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; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
