[vlc-commits] demux: ts: rename psip base pid tracking reference on pmt

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar  3 12:34:28 2016 +0100| [2d279153b9969790fcb7685b67c2f5f81e249818] | committer: Francois Cartegnie

demux: ts: rename psip base pid tracking reference on pmt

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

 modules/demux/mpeg/ts_psi.c             |    6 +++---
 modules/demux/mpeg/ts_streams_private.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 05676ea..5a474fc 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1442,8 +1442,8 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
     pid_to_decref.i_alloc = p_pmt->e_streams.i_alloc;
     pid_to_decref.i_size = p_pmt->e_streams.i_size;
     pid_to_decref.p_elems = p_pmt->e_streams.p_elems;
-    if( p_pmt->p_mgt )
-        ARRAY_APPEND( pid_to_decref, p_pmt->p_mgt );
+    if( p_pmt->p_atsc_si_basepid )
+        ARRAY_APPEND( pid_to_decref, p_pmt->p_atsc_si_basepid );
     ARRAY_INIT(p_pmt->e_streams);
 
     if( p_pmt->iod )
@@ -1657,7 +1657,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
             }
             else
             {
-                p_pmt->p_mgt = atsc_base_pid;
+                p_pmt->p_atsc_si_basepid = atsc_base_pid;
                 SetPIDFilter( p_demux->p_sys, atsc_base_pid, true );
                 msg_Dbg( p_demux, "  * pid=%d listening for MGT/STT", atsc_base_pid->i_pid );
 
diff --git a/modules/demux/mpeg/ts_streams_private.h b/modules/demux/mpeg/ts_streams_private.h
index 727c97d..e4dbab1 100644
--- a/modules/demux/mpeg/ts_streams_private.h
+++ b/modules/demux/mpeg/ts_streams_private.h
@@ -49,7 +49,7 @@ struct ts_pmt_t
 
     DECL_ARRAY(ts_pid_t *) e_streams;
 
-    ts_pid_t        *p_mgt;
+    ts_pid_t        *p_atsc_si_basepid;
 
     struct
     {