Logo: thread safety fix

There are still bugs. At least posx, posy, pos and b_need_update are not
protected properly, but I don't have time.

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index ba2152bba1bf4bb35092524b8dbae3a5ebc9743a..bdc988d3b8f96adbf92ee45cdbf49f56994d5838 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -704,6 +704,9 @@ static int CreateFilter( vlc_object_t *p_this )
     p_logo_list->i_repeat =
         var_CreateGetIntegerCommand( p_filter, "logo-repeat" );
 
+    vlc_mutex_init( &p_logo_list->lock );
+    LoadLogoList( p_this, p_logo_list );
+
     var_AddCallback( p_filter, "logo-file", LogoCallback, p_sys );
     var_AddCallback( p_filter, "logo-x", LogoCallback, p_sys );
     var_AddCallback( p_filter, "logo-y", LogoCallback, p_sys );
@@ -711,13 +714,6 @@ static int CreateFilter( vlc_object_t *p_this )
     var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys );
     var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys );
 
-    vlc_mutex_init( &p_logo_list->lock );
-    vlc_mutex_lock( &p_logo_list->lock );
-
-    LoadLogoList( p_this, p_logo_list );
-
-    vlc_mutex_unlock( &p_logo_list->lock );
-
     /* Misc init */
     p_filter->pf_sub_filter = Filter;
     p_sys->b_need_update = true;