Commit 7bf82d91 authored by Rémi Duraffort's avatar Rémi Duraffort

live555: fix use of uninitialized value (partial and manual backport of

a30ec4a2)
parent 91bc65e6
...@@ -1237,7 +1237,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1237,7 +1237,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64, i64; int64_t *pi64, i64;
double *pf, f; double *pf, f;
bool *pb, *pb2, b_bool; bool *pb, *pb2;
int *pi_int; int *pi_int;
switch( i_query ) switch( i_query )
...@@ -1402,8 +1402,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1402,8 +1402,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_SET_PAUSE_STATE: case DEMUX_SET_PAUSE_STATE:
{ {
int i;
p_sys->b_paused = (bool)va_arg( args, int ); p_sys->b_paused = (bool)va_arg( args, int );
if( p_sys->rtsp == NULL ) if( p_sys->rtsp == NULL )
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1430,7 +1428,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1430,7 +1428,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
else if( !p_sys->b_paused && p_sys->p_timeout != NULL ) else if( !p_sys->b_paused && p_sys->p_timeout != NULL )
p_sys->p_timeout->b_handle_keep_alive = false; p_sys->p_timeout->b_handle_keep_alive = false;
for( i = 0; !b_bool && i < p_sys->i_track; i++ ) if( !p_sys->b_paused )
{
for( int i = 0; i < p_sys->i_track; i++ )
{ {
live_track_t *tk = p_sys->track[i]; live_track_t *tk = p_sys->track[i];
tk->b_rtcp_sync = false; tk->b_rtcp_sync = false;
...@@ -1438,6 +1438,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1438,6 +1438,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
p_sys->i_pcr = 0; p_sys->i_pcr = 0;
es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
} }
}
/* Reset data received counter */ /* Reset data received counter */
p_sys->i_no_data_ti = 0; p_sys->i_no_data_ti = 0;
......
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