]> git.sesse.net Git - vlc/commitdiff
fix overriden variables.
authorRémi Duraffort <ivoire@videolan.org>
Sun, 1 Feb 2009 17:35:21 +0000 (18:35 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Tue, 3 Feb 2009 10:49:01 +0000 (11:49 +0100)
modules/demux/ps.h
modules/demux/vobsub.c

index a15daad3cc010dfd970734c5fa79fb746191598d..2c2515169f3d4be6c55371a04fe597e586a893d5 100644 (file)
@@ -559,8 +559,6 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
         es.i_descriptor = i_info_length;
         if( i_info_length > 0 )
         {
-            int i = 0;
-
             es.p_descriptor = malloc( i_info_length );
             if( es.p_descriptor )
             {
index 3b90e2da5be5a9784ca1782b901ebda3b9fbbe3c..c52e19f578097228ceb990718d3c9e3bb96f3164 100644 (file)
@@ -472,7 +472,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( ;; )
     {
@@ -549,7 +548,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
                 p_sys->track = realloc( p_sys->track, 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;