[vlc-commits] input: es_out: fix impossible commandline selection of not defaultable tracks

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jun 12 17:38:13 2020 +0200| [f8358458ee3a8f5224a1a489b79ba8a7c7bed86e] | committer: Francois Cartegnie

input: es_out: fix impossible commandline selection of not defaultable tracks

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

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

diff --git a/src/input/es_out.c b/src/input/es_out.c
index f8b5c65d07..678e80e624 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2413,8 +2413,10 @@ static bool EsOutSelectMatchPrioritized( const es_out_es_props_t *p_esprops,
     {
         return ( es->fmt.i_priority > p_esprops->p_main_es->fmt.i_priority );
     }
-
-    return false;
+    else
+    {
+        return ( es->fmt.i_priority > ES_PRIORITY_NOT_DEFAULTABLE );
+    }
 }
 
 static bool EsOutSelectMatchExplicitParams( const es_out_es_props_t *p_esprops,
@@ -2462,10 +2464,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
 {
     es_out_sys_t *p_sys = container_of(out, es_out_sys_t, out);
     es_out_es_props_t *p_esprops = GetPropsByCat( p_sys, es->fmt.i_cat );
-
-    if( !p_esprops || !p_sys->b_active ||
-        ( !b_force && es->fmt.i_priority < ES_PRIORITY_SELECTABLE_MIN ) ||
-        !es->p_pgrm )
+    if( !p_esprops || !p_sys->b_active || !es->p_pgrm )
     {
         return;
     }