[vlc-devel] commit: fix overriden variables. ( Rémi Duraffort )

git version control git at videolan.org
Tue Feb 3 11:50:40 CET 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sun Feb  1 18:35:21 2009 +0100| [0bed6fc3e3d1622f999b88bc908b8f5f1327da7c] | committer: Rémi Duraffort 

fix overriden variables.

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

 modules/demux/ps.h     |    2 --
 modules/demux/vobsub.c |    3 +--
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index a15daad..2c25151 100644
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -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 )
             {
diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 3b90e2d..c52e19f 100644
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -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;




More information about the vlc-devel mailing list