Skip to content

V
vlc-2-2
Commit 1309527c authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

TS mux: while -> for

parent 56933e8e
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 27 deletions
modules/mux/mpeg/ts.c
View file @ 1309527c
...@@ -916,7 +916,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -916,7 +916,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{ {
sout_mux_sys_t *p_sys = p_mux->p_sys; sout_mux_sys_t *p_sys = p_mux->p_sys;
ts_stream_t *p_stream; ts_stream_t *p_stream;
int i;
p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) ); p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
if( !p_input->p_sys ) if( !p_input->p_sys )
...@@ -1065,7 +1064,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1065,7 +1064,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
free( p_stream ); free( p_stream );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
i = 1;
p_stream->lang[0] = p_stream->lang[0] =
p_stream->lang[1] = p_stream->lang[1] =
p_stream->lang[2] = '\0'; p_stream->lang[2] = '\0';
...@@ -1097,10 +1096,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1097,10 +1096,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream->lang[2] ); p_stream->lang[2] );
} }
} }
while( i < p_stream->i_langs ) { for (int i = 1; i < p_stream->i_langs; i++) {
if( p_input->p_fmt->p_extra_languages[i-1].psz_language )
{
char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language; char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language;
if (!psz)
continue;
const iso639_lang_t *pl = NULL; const iso639_lang_t *pl = NULL;
if( strlen( psz ) == 2 ) if( strlen( psz ) == 2 )
...@@ -1126,8 +1126,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1126,8 +1126,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream->lang[i*3+2] ); p_stream->lang[i*3+2] );
} }
} }
i++;
}
/* Create decoder specific info for subt */ /* Create decoder specific info for subt */
if( p_stream->i_codec == VLC_CODEC_SUBT ) if( p_stream->i_codec == VLC_CODEC_SUBT )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment