Skip to content

V
vlc-2-2
Commit 622ac6fc authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Add missing va_end (cid #1049745)

parent 3a5100e8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
modules/demux/mpeg/es.c
View file @ 622ac6fc
...@@ -339,11 +339,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -339,11 +339,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_HAS_UNSUPPORTED_META: case DEMUX_HAS_UNSUPPORTED_META:
pb_bool = (bool*)va_arg( args, bool* ); pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = true; *pb_bool = true;
va_end( args_save );
return VLC_SUCCESS; return VLC_SUCCESS;
case DEMUX_GET_TIME: case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * ); pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = p_sys->i_pts + p_sys->i_time_offset; *pi64 = p_sys->i_pts + p_sys->i_time_offset;
va_end( args_save );
return VLC_SUCCESS; return VLC_SUCCESS;
case DEMUX_GET_LENGTH: case DEMUX_GET_LENGTH:
...@@ -360,10 +362,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -360,10 +362,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
* don't bother trying ... Too bad */ * don't bother trying ... Too bad */
if( f_pos < 0.01 || if( f_pos < 0.01 ||
(p_sys->i_pts + p_sys->i_time_offset) < 8000000 ) (p_sys->i_pts + p_sys->i_time_offset) < 8000000 )
{
va_end( args_save );
return VLC_EGENERIC; return VLC_EGENERIC;
}
pi64 = (int64_t *)va_arg( args_save, int64_t * ); pi64 = (int64_t *)va_arg( args_save, int64_t * );
*pi64 = (p_sys->i_pts + p_sys->i_time_offset) / f_pos; *pi64 = (p_sys->i_pts + p_sys->i_time_offset) / f_pos;
va_end( args_save );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
va_end( args_save ); va_end( args_save );
...@@ -376,6 +382,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -376,6 +382,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
i_ret = demux_vaControlHelper( p_demux->s, p_sys->i_stream_offset, -1, i_ret = demux_vaControlHelper( p_demux->s, p_sys->i_stream_offset, -1,
p_sys->i_bitrate_avg, 1, i_query, p_sys->i_bitrate_avg, 1, i_query,
args ); args );
va_end( args_save );
if( !i_ret && p_sys->i_bitrate_avg > 0 && if( !i_ret && p_sys->i_bitrate_avg > 0 &&
(i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME) ) (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME) )
{ {
......
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