[vlc-commits] input: es_out: no vout deletion on video esDel/esAdd

Francois Cartegnie git at videolan.org
Fri Jun 29 14:49:19 CEST 2018


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 28 19:12:07 2018 +0200| [1f6b1af0a94aebade745d579646e35d1b6c055c0] | committer: Francois Cartegnie

input: es_out: no vout deletion on video esDel/esAdd

causes vout deletion between video es
b09ab2cf7cf762cd20436be73b74495407de2450 regression

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

 src/input/es_out.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index d36fd2c4ff..7b115ffb52 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2281,7 +2281,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
                 i_mode == ES_OUT_MODE_AUTO || i_mode == ES_OUT_MODE_PARTIAL ||
                 i_mode == ES_OUT_MODE_END );
 
-        if (i_mode != ES_OUT_MODE_NONE && !p_sys->b_active)
+        if (i_mode != ES_OUT_MODE_NONE && !p_sys->b_active && !vlc_list_is_empty(&p_sys->es))
         {
             /* XXX Terminate vout if there are tracks but no video one.
              * This one is not mandatory but is he earliest place where it



More information about the vlc-commits mailing list