[vlc-commits] input: es_out: do not temporarily select if explicit params

Francois Cartegnie git at videolan.org
Fri Jul 3 09:38:04 CEST 2020


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul  2 20:06:45 2020 +0200| [554a84e01c5e45b69dea9bf1e37cf9f6bdf58ec3] | committer: Francois Cartegnie

input: es_out: do not temporarily select if explicit params

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

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

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 483f3494d4..ab8beb25ac 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2524,11 +2524,9 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
 
         if( EsOutSelectHasExplicitParams( p_esprops ) )
         {
-            b_auto_selected = false;
-            if( EsOutSelectMatchExplicitParams( p_esprops, es ) )
-            {
-                wanted_es = es;
-            }
+            if( !EsOutSelectMatchExplicitParams( p_esprops, es ) )
+                return;
+            wanted_es = es;
         }
         else if( p_esprops->ppsz_language )
         {



More information about the vlc-commits mailing list