Skip to content

V
vlc-1.1
Commit f90f0553 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Cleanup input stats when sout fails

parent 61f1c0ba
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
src/input/input.c
View file @ f90f0553
...@@ -1142,7 +1142,7 @@ static int Init( input_thread_t * p_input ) ...@@ -1142,7 +1142,7 @@ static int Init( input_thread_t * p_input )
#ifdef ENABLE_SOUT #ifdef ENABLE_SOUT
ret = InitSout( p_input ); ret = InitSout( p_input );
if( ret != VLC_SUCCESS ) if( ret != VLC_SUCCESS )
return ret; /* FIXME: goto error; should be better here */ goto error_stats;
#endif #endif
/* Create es out */ /* Create es out */
...@@ -1240,6 +1240,9 @@ error: ...@@ -1240,6 +1240,9 @@ error:
input_ressource_SetInput( p_input->p->p_ressource, NULL ); input_ressource_SetInput( p_input->p->p_ressource, NULL );
} }
#ifdef ENABLE_SOUT
error_stats:
#endif
if( !p_input->b_preparsing && libvlc_stats( p_input ) ) if( !p_input->b_preparsing && libvlc_stats( p_input ) )
{ {
#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \ #define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
......
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