Commit fafb5347 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Now that sout-all is default, make --programs take precedence over it

parent 9a76128f
...@@ -1126,11 +1126,6 @@ static void InitPrograms( input_thread_t * p_input ) ...@@ -1126,11 +1126,6 @@ static void InitPrograms( input_thread_t * p_input )
{ {
char *prgms; char *prgms;
if( var_GetBool( p_input, "sout-all" ) )
{
i_es_out_mode = ES_OUT_MODE_ALL;
}
else
if( (prgms = var_GetNonEmptyString( p_input, "programs" )) != NULL ) if( (prgms = var_GetNonEmptyString( p_input, "programs" )) != NULL )
{ {
char *buf; char *buf;
...@@ -1150,6 +1145,10 @@ static void InitPrograms( input_thread_t * p_input ) ...@@ -1150,6 +1145,10 @@ static void InitPrograms( input_thread_t * p_input )
free( prgms ); free( prgms );
} }
else if( var_GetBool( p_input, "sout-all" ) )
{
i_es_out_mode = ES_OUT_MODE_ALL;
}
} }
es_out_SetMode( p_input->p->p_es_out, i_es_out_mode ); es_out_SetMode( p_input->p->p_es_out, i_es_out_mode );
......
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