Now that sout-all is default, make --programs take precedence over it
authorRafaël Carré <funman@videolan.org>
Thu, 21 Aug 2014 13:21:59 +0000 (15:21 +0200)
committerRafaël Carré <funman@videolan.org>
Thu, 21 Aug 2014 13:21:59 +0000 (15:21 +0200)
src/input/input.c

index 7479653..7f916f2 100644 (file)
@@ -1126,11 +1126,6 @@ static void InitPrograms( input_thread_t * p_input )
     {
         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 )
         {
             char *buf;
@@ -1150,6 +1145,10 @@ static void InitPrograms( input_thread_t * p_input )
 
             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 );