vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Apr 15 
11:50:09 2018 +0300| [ab69a7e246beddff214a28fcc040a8f37c5e97fb] | committer: 
Rémi Denis-Courmont

mpeg es: fix one shadowed variable

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

 modules/demux/mpeg/es.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index 2bbcb4738d..4710a2894a 100644
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -574,6 +574,7 @@ static int WavSkipHeader( demux_t *p_demux, int *pi_skip, 
const int pi_format[],
 {
     const uint8_t *p_peek;
     int         i_peek = 0;
+    uint32_t i_len;
 
     /* */
     *pi_skip = 0;
@@ -589,7 +590,7 @@ static int WavSkipHeader( demux_t *p_demux, int *pi_skip, 
const int pi_format[],
     i_peek = 12 + 8;
     while( memcmp( p_peek + i_peek - 8, "fmt ", 4 ) )
     {
-        uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+        i_len = GetDWLE( p_peek + i_peek - 4 );
         if( i_len > WAV_PROBE_SIZE || i_peek + i_len > WAV_PROBE_SIZE )
             return VLC_EGENERIC;
 
@@ -599,7 +600,7 @@ static int WavSkipHeader( demux_t *p_demux, int *pi_skip, 
const int pi_format[],
     }
 
     /* Sanity check the wave format header */
-    uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+    i_len = GetDWLE( p_peek + i_peek - 4 );
     if( i_len > WAV_PROBE_SIZE )
         return VLC_EGENERIC;
 
@@ -623,7 +624,7 @@ static int WavSkipHeader( demux_t *p_demux, int *pi_skip, 
const int pi_format[],
     /* Skip the wave header */
     while( memcmp( p_peek + i_peek - 8, "data", 4 ) )
     {
-        uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
+        i_len = GetDWLE( p_peek + i_peek - 4 );
         if( i_len > WAV_PROBE_SIZE || i_peek + i_len > WAV_PROBE_SIZE )
             return VLC_EGENERIC;
 

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to