Skip to content

V
vlc
Commit cef623b9 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

Revert "libvlc: Wait for input end." 

This reverts commit 1dfd50c2.
This is no needed of such a hack if there is no circular dependency between input and vout and if the input are properly released.
parent 3eadc797
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 10 deletions
src/libvlc-common.c
View file @ cef623b9
......@@ -931,7 +931,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
intf_thread_t * p_intf = NULL;
vout_thread_t * p_vout = NULL;
input_thread_t * p_input = NULL;
aout_instance_t * p_aout = NULL;
announce_handler_t * p_announce = NULL;
......@@ -950,15 +949,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
msg_Dbg( p_libvlc, "removing playlist" );
playlist_ThreadDestroy( p_libvlc->p_playlist );
/* Free input */
msg_Dbg( p_libvlc, "waiting all input end" );
while( (p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD )) )
{
vlc_object_kill( p_input );
vlc_thread_join( p_input );
vlc_object_release( p_input );
}
/* Free video outputs */
msg_Dbg( p_libvlc, "removing all video outputs" );
while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
......
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