[vlc-commits] demux: ts: ensure group is always set on es

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Jan 24 00:37:36 2016 +0100| [de1a984f5274a18225459c9c0a8ed242bd500f5d] | committer: Francois Cartegnie

demux: ts: ensure group is always set on es

fixes regression with telx where additional
pages had group 0 and deselected default program
on creation.

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

 modules/demux/mpeg/ts.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 62210f6..75d357e 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -5116,6 +5116,8 @@ static void DoCreateES( demux_t *p_demux, ts_pes_es_t *p_es, const ts_pes_es_t *
     {
         if( !p_es->id )
         {
+            if( !p_es->fmt.i_group )
+                p_es->fmt.i_group = p_es->p_program->i_number;
             p_es->id = es_out_Add( p_demux->out, &p_es->fmt );
             if( p_parent_es ) /* Set Extra ES group and original ID */
             {
@@ -5862,6 +5864,7 @@ static ts_pes_es_t * ts_pes_es_New( ts_pmt_t *p_program )
         p_es->p_next = NULL;
         p_es->b_interlaced = false;
         es_format_Init( &p_es->fmt, UNKNOWN_ES, 0 );
+        p_es->fmt.i_group = p_program->i_number;
     }
     return p_es;
 }