[vlc-commits] demux: ts: don't clear temporary program list on SET_GROUP (fix #19434)

Francois Cartegnie git at videolan.org
Mon Jan 8 13:12:30 CET 2018


vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jan  8 12:01:32 2018 +0100| [6b0ef10ef69df1dd4698dd89b0170a135a909537] | committer: Jean-Baptiste Kempf

demux: ts: don't clear temporary program list on SET_GROUP (fix #19434)

otherwise we don't know which program is selected
maybe core might feedback this one day

(cherry picked from commit d4df22f8256381b41205ecfb04052c7a0ed83f52)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mpeg/ts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index bb355b8a06..e427059c92 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -1079,7 +1079,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
             p_sys->b_default_selection = false;
         }
-        else
+        else if( !p_sys->b_default_selection )
         {
             ARRAY_RESET( p_sys->programs );
             p_sys->seltype = PROGRAM_AUTO_DEFAULT;



More information about the vlc-commits mailing list