[vlc-commits] es_out: reindent after previous commit

Thomas Guillem git at videolan.org
Thu Jul 19 10:47:18 CEST 2018


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jul 19 10:45:01 2018 +0200| [e0a2b90a50f1ba94429ef013bf800b7552a16ea1] | committer: Thomas Guillem

es_out: reindent after previous commit

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

 src/input/es_out.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 0d763769ed..2b1dd7c995 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1741,36 +1741,36 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     else
     {
         const bool b_sout = input_priv(p_input)->p_sout != NULL;
-        if( es->b_forced )
+        /* If b_forced, the ES is specifically requested by the user, so bypass
+         * the following vars check. */
+        if( !es->b_forced )
         {
-            /* ES specifically requested by the user: bypass the following vars
-             * check. */
-        }
-        else if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
-        {
-            if( !var_GetBool( p_input, b_sout ? "sout-video" : "video" ) )
+            if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
             {
-                msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
-                         es->i_id );
-                return;
+                if( !var_GetBool( p_input, b_sout ? "sout-video" : "video" ) )
+                {
+                    msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+                             es->i_id );
+                    return;
+                }
             }
-        }
-        else if( es->fmt.i_cat == AUDIO_ES )
-        {
-            if( !var_GetBool( p_input, b_sout ? "sout-audio" : "audio" ) )
+            else if( es->fmt.i_cat == AUDIO_ES )
             {
-                msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
-                         es->i_id );
-                return;
+                if( !var_GetBool( p_input, b_sout ? "sout-audio" : "audio" ) )
+                {
+                    msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
+                             es->i_id );
+                    return;
+                }
             }
-        }
-        if( !es->b_forced && es->fmt.i_cat == SPU_ES )
-        {
-            if( !var_GetBool( p_input, b_sout ? "sout-spu" : "spu" ) )
+            if( es->fmt.i_cat == SPU_ES )
             {
-                msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
-                         es->i_id );
-                return;
+                if( !var_GetBool( p_input, b_sout ? "sout-spu" : "spu" ) )
+                {
+                    msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
+                             es->i_id );
+                    return;
+                }
             }
         }
 



More information about the vlc-commits mailing list