[vlc-commits] Now that sout-all is default, make --programs take precedence over it

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Aug 21 15:21:59 2014 +0200| [fafb5347796392a6c5256a5d9490d3d9a054d994] | committer: Rafaël Carré

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fafb5347796392a6c5256a5d9490d3d9a054d994
---

 src/input/input.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 7479653..7f916f2 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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 );