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

input: small code factorization

parent d90abb6b
...@@ -519,9 +519,6 @@ static void *Run( vlc_object_t *p_this ) ...@@ -519,9 +519,6 @@ static void *Run( vlc_object_t *p_this )
{ {
/* If we failed, wait before we are killed, and exit */ /* If we failed, wait before we are killed, and exit */
WaitDie( p_input ); WaitDie( p_input );
/* Tell we're dead */
input_SendEventDead( p_input );
goto exit; goto exit;
} }
...@@ -535,6 +532,8 @@ static void *Run( vlc_object_t *p_this ) ...@@ -535,6 +532,8 @@ static void *Run( vlc_object_t *p_this )
End( p_input ); End( p_input );
exit: exit:
/* Tell we're dead */
input_SendEventDead( p_input );
vlc_restorecancel( canc ); vlc_restorecancel( canc );
return NULL; return NULL;
} }
...@@ -1385,9 +1384,6 @@ static void End( input_thread_t * p_input ) ...@@ -1385,9 +1384,6 @@ static void End( input_thread_t * p_input )
input_ressource_RequestSout( p_input->p->p_ressource, input_ressource_RequestSout( p_input->p->p_ressource,
p_input->p->p_sout, NULL ); p_input->p->p_sout, NULL );
input_ressource_SetInput( p_input->p->p_ressource, NULL ); input_ressource_SetInput( p_input->p->p_ressource, NULL );
/* Tell we're dead */
input_SendEventDead( p_input );
} }
/***************************************************************************** /*****************************************************************************
......
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