Skip to content

V
vlc
Commit de6ce14e authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Do not save a vout if there is still an active vout.

parent d61e4c6c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/input/ressource.c
View file @ de6ce14e
...@@ -229,11 +229,12 @@ static vout_thread_t *RequestVout( input_ressource_t *p_ressource, ...@@ -229,11 +229,12 @@ static vout_thread_t *RequestVout( input_ressource_t *p_ressource,
vlc_mutex_lock( &p_ressource->lock_vout ); vlc_mutex_lock( &p_ressource->lock_vout );
TAB_REMOVE( p_ressource->i_vout, p_ressource->pp_vout, p_vout ); TAB_REMOVE( p_ressource->i_vout, p_ressource->pp_vout, p_vout );
const int i_vout_active = p_ressource->i_vout;
vlc_mutex_unlock( &p_ressource->lock_vout ); vlc_mutex_unlock( &p_ressource->lock_vout );
if( p_ressource->p_vout_free ) if( p_ressource->p_vout_free || i_vout_active > 0 )
{ {
msg_Dbg( p_ressource->p_input, "detroying vout (already one saved)" ); msg_Dbg( p_ressource->p_input, "detroying vout (already one saved or active)" );
vout_CloseAndRelease( p_vout ); vout_CloseAndRelease( 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