[vlc-commits] vobsub: fix variable shadowing

Rémi Denis-Courmont git at videolan.org
Sun Jul 23 16:53:51 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 23 16:50:10 2017 +0300| [cb4a5be23a3200c01bd741f08b62e7fd9dd2be89] | committer: Rémi Denis-Courmont

vobsub: fix variable shadowing

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

 modules/demux/vobsub.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index d46775b5b5..119233b26a 100644
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -482,7 +482,6 @@ static int ParseVobSubIDX( demux_t *p_demux )
     demux_sys_t *p_sys = p_demux->p_sys;
     text_t      *txt = &p_sys->txt;
     char        *line;
-    vobsub_track_t *current_tk = NULL;
 
     for( ;; )
     {
@@ -544,7 +543,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
                     sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) );
 
             /* Init the track */
-            current_tk = &p_sys->track[p_sys->i_tracks - 1];
+            vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
             memset( current_tk, 0, sizeof( vobsub_track_t ) );
             current_tk->i_current_subtitle = 0;
             current_tk->i_subtitles = 0;



More information about the vlc-commits mailing list