Commit fe587068 authored by Laurent Aimar's avatar Laurent Aimar

Do not hold change_lock while loading the vout module.

It allows the module to trigger some vout callback while loading.
parent 4c49a91a
...@@ -979,9 +979,6 @@ static void* RunThread( void *p_this ) ...@@ -979,9 +979,6 @@ static void* RunThread( void *p_this )
bool b_picture_interlaced_last = false; bool b_picture_interlaced_last = false;
mtime_t i_picture_interlaced_last_date; mtime_t i_picture_interlaced_last_date;
vlc_mutex_lock( &p_vout->change_lock );
/* /*
* Initialize thread * Initialize thread
*/ */
...@@ -989,6 +986,9 @@ static void* RunThread( void *p_this ) ...@@ -989,6 +986,9 @@ static void* RunThread( void *p_this )
p_vout->p->psz_module_type, p_vout->p->psz_module_type,
p_vout->p->psz_module_name, p_vout->p->psz_module_name,
!strcmp(p_vout->p->psz_module_type, "video filter") ); !strcmp(p_vout->p->psz_module_type, "video filter") );
vlc_mutex_lock( &p_vout->change_lock );
if( p_vout->p_module ) if( p_vout->p_module )
p_vout->b_error = InitThread( p_vout ); p_vout->b_error = InitThread( p_vout );
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment