Revert "fix overriden variables."

This reverts commit 0bed6fc3e3d1622f999b88bc908b8f5f1327da7c.

It is broken (at least for ps).

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index 2c2515169f3d4be6c55371a04fe597e586a893d5..a15daad3cc010dfd970734c5fa79fb746191598d 100644 (file)
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -559,6 +559,8 @@ 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 )
             {

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index c52e19f578097228ceb990718d3c9e3bb96f3164..3b90e2da5be5a9784ca1782b901ebda3b9fbbe3c 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -472,6 +472,7 @@ 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( ;; )
     {
@@ -548,7 +549,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 */
-                vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
+                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;