[vlc-commits] ts: fix variable shadowing

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 29 23:19:18 2017 +0300| [a6e0acd6687fa33d727c8c95a9e76b9b0c4afe03] | committer: Rémi Denis-Courmont

ts: fix variable shadowing

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

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

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index a771afbd4c..0e7a64f28d 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -1069,7 +1069,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             else // All ES Mode
             {
                 p_sys->b_es_all = true;
-                ts_pat_t *p_pat = GetPID(p_sys, 0)->u.p_pat;
+                p_pat = GetPID(p_sys, 0)->u.p_pat;
                 for( int i = 0; i < p_pat->programs.i_size; i++ )
                    ARRAY_APPEND( p_sys->programs, p_pat->programs.p_elems[i]->i_pid );
                 UpdatePESFilters( p_demux, true );
@@ -2140,10 +2140,10 @@ static void ProgramSetPCR( demux_t *p_demux, ts_pmt_t *p_pmt, mtime_t i_pcr )
         ts_pat_t *p_pat = GetPID(p_sys, 0)->u.p_pat;
         for( int i=0; i< p_pat->programs.i_size; i++ )
         {
-            ts_pmt_t *p_pmt = p_pat->programs.p_elems[i]->u.p_pmt;
-            for( int j=0; j<p_pmt->e_streams.i_size; j++ )
+            ts_pmt_t *p_opmt = p_pat->programs.p_elems[i]->u.p_pmt;
+            for( int j=0; j<p_opmt->e_streams.i_size; j++ )
             {
-                ts_pid_t *p_pid = p_pmt->e_streams.p_elems[j];
+                ts_pid_t *p_pid = p_opmt->e_streams.p_elems[j];
                 block_t *p_block = p_pid->u.p_stream->prepcr.p_head;
                 while( p_block && p_block->i_dts == VLC_TS_INVALID )
                     p_block = p_block->p_next;
diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index dfef6f8df3..c945d51baf 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -829,7 +829,7 @@ static void OpusSetup(demux_t *demux, uint8_t *p, size_t len, es_format_t *p_fmt
         csc = p_csc[channels - 1];
         stream_count = channels - csc;
 
-        static const uint8_t map[6][7] = {
+        static const uint8_t maps[6][7] = {
             { 2,1 },
             { 1,2,3 },
             { 4,1,2,3 },
@@ -838,7 +838,7 @@ static void OpusSetup(demux_t *demux, uint8_t *p, size_t len, es_format_t *p_fmt
             { 6,1,2,3,4,5,7 },
         };
         if (channels > 2)
-            memcpy(&h.stream_map[1], map[channels-3], channels - 1);
+            memcpy(&h.stream_map[1], maps[channels-3], channels - 1);
     } else if (ccc == 0x81) {
         if (len < 4)
             goto explicit_config_too_short;