From: Laurent Aimar Date: Sat, 17 Oct 2009 18:14:10 +0000 (+0200) Subject: Do not hold change_lock while loading the vout module. X-Git-Tag: 1.1.0-ff~2748 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fe587068239cf446a31c4638796b03718291ffcf;p=vlc Do not hold change_lock while loading the vout module. It allows the module to trigger some vout callback while loading. --- diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 566126bdbd..c5aa29ba10 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -979,9 +979,6 @@ static void* RunThread( void *p_this ) bool b_picture_interlaced_last = false; mtime_t i_picture_interlaced_last_date; - - vlc_mutex_lock( &p_vout->change_lock ); - /* * Initialize thread */ @@ -989,6 +986,9 @@ static void* RunThread( void *p_this ) p_vout->p->psz_module_type, p_vout->p->psz_module_name, !strcmp(p_vout->p->psz_module_type, "video filter") ); + + vlc_mutex_lock( &p_vout->change_lock ); + if( p_vout->p_module ) p_vout->b_error = InitThread( p_vout ); else