[vlc-commits] es_out: refactor b_autoselect check

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb 28 14:04:02 2020 +0100| [92e3c5ecdb2ad546d5df1f12fac4331f5dad459a] | committer: Thomas Guillem

es_out: refactor b_autoselect check

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

 src/input/es_out.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index aa80122f97..8b5f9e6e2e 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2452,6 +2452,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
             policy = ES_OUT_ES_POLICY_EXCLUSIVE;
     }
 
+    bool b_auto_selected = p_esprops->b_autoselect;
     bool b_auto_unselect = p_sys->i_mode == ES_OUT_MODE_AUTO &&
                            policy == ES_OUT_ES_POLICY_EXCLUSIVE &&
                            p_esprops->p_main_es && p_esprops->p_main_es != es;
@@ -2553,7 +2554,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
                         else if( p_esprops->p_main_es == NULL ||
                                  es->fmt.i_priority > p_esprops->p_main_es->fmt.i_priority )
                         {
-                            if( p_esprops->b_autoselect )
+                            if( b_auto_selected )
                                 wanted_es = es;
                         }
                     }
@@ -2570,7 +2571,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
         else if( p_esprops->p_main_es == NULL ||
                  es->fmt.i_priority > p_esprops->p_main_es->fmt.i_priority )
         {
-            if( p_esprops->b_autoselect )
+            if( b_auto_selected )
                 wanted_es = es;
         }