Commit 9f2fb28d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove the brain-damaged video output destruction code

Fixes crashes, deadlocks and assertions failure with #1650.
One cannot remove object references one does not own.

Reopens #1637.
parent 2d6a7985
...@@ -193,16 +193,6 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) ...@@ -193,16 +193,6 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
} }
vlc_mutex_lock( &p_playlist->gc_lock ); vlc_mutex_lock( &p_playlist->gc_lock );
/* Remove video outputs when user presses stop: */
vlc_list_t *list = vlc_list_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
FIND_CHILD );
if( list != NULL )
{
msg_Dbg( p_playlist, "removing %u vout(s)", list->i_count );
for( int i = 0; i < list->i_count; i++)
vlc_object_release( list->p_values[i].p_object );
vlc_list_release( list );
}
p_playlist->b_cant_sleep = false; p_playlist->b_cant_sleep = false;
vlc_mutex_unlock( &p_playlist->gc_lock ); vlc_mutex_unlock( &p_playlist->gc_lock );
} }
......
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