[vlc-commits] es_out: only reselect previously selected es on SET_FMT

Francois Cartegnie git at videolan.org
Wed Nov 7 13:53:36 CET 2018


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Nov  7 13:50:23 2018 +0100| [398122874a22b0ce8c3f958d7acd43c50b5ab917] | committer: Francois Cartegnie

es_out: only reselect previously selected es on SET_FMT

this reverts 63d29c69c5ed944ff5d09a8e557533d9b813cc83

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

 src/input/es_out.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 85220c8eba..61e08cb82a 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2746,13 +2746,15 @@ static int EsOutVaControlLocked( es_out_t *out, int i_query, va_list args )
         EsOutFillEsFmt( out, &es->fmt );
         EsOutUpdateEsLanguageTitle(es, &es->fmt);
 
+        const bool b_was_selected = EsIsSelected( es );
         if( es->p_dec )
         {
             EsOutDrainDecoder( out, es );
             EsOutDestroyDecoder( out, es );
         }
 
-        EsOutCreateDecoder( out, es );
+        if(b_was_selected)
+            EsOutCreateDecoder( out, es );
 
         return VLC_SUCCESS;
     }



More information about the vlc-commits mailing list