Commit 92777ea1 authored by Laurent Aimar's avatar Laurent Aimar

* input.c: set access2->b_die.

parent 82e174bc
...@@ -341,6 +341,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, ...@@ -341,6 +341,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
void input_StopThread( input_thread_t *p_input ) void input_StopThread( input_thread_t *p_input )
{ {
demux_t *p_demux; demux_t *p_demux;
access_t *p_access;
/* Make the thread exit from a possible vlc_cond_wait() */ /* Make the thread exit from a possible vlc_cond_wait() */
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
...@@ -348,14 +349,21 @@ void input_StopThread( input_thread_t *p_input ) ...@@ -348,14 +349,21 @@ void input_StopThread( input_thread_t *p_input )
/* Request thread destruction */ /* Request thread destruction */
/* Temporary demux2 hack */ /* Temporary demux2 hack */
p_demux = (demux_t *)vlc_object_find( p_input, VLC_OBJECT_DEMUX, p_demux = (demux_t *)vlc_object_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
FIND_CHILD );
if( p_demux ) if( p_demux )
{ {
p_demux->b_die = 1; p_demux->b_die = 1;
vlc_object_release( p_demux ); vlc_object_release( p_demux );
} }
/* Temporary access2 hack */
p_access = (access_t *)vlc_object_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
if( p_access )
{
p_access->b_die = 1;
vlc_object_release( p_access );
}
p_input->b_die = 1; p_input->b_die = 1;
vlc_cond_signal( &p_input->stream.stream_wait ); vlc_cond_signal( &p_input->stream.stream_wait );
......
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