Commit 7e12de50 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

es: copy va_list only when needed

parent 8beacc9e
......@@ -332,28 +332,28 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
int64_t *pi64;
bool *pb_bool;
int i_ret;
va_list args_save;
va_copy ( args_save, args );
switch( i_query )
{
case DEMUX_HAS_UNSUPPORTED_META:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = true;
va_end( args_save );
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = p_sys->i_pts + p_sys->i_time_offset;
va_end( args_save );
return VLC_SUCCESS;
case DEMUX_GET_LENGTH:
i_ret = demux_vaControlHelper( p_demux->s, p_sys->i_stream_offset, -1,
p_sys->i_bitrate_avg, 1, i_query,
args );
{
va_list ap;
va_copy ( ap, args );
i_ret = demux_vaControlHelper( p_demux->s, p_sys->i_stream_offset,
-1, p_sys->i_bitrate_avg, 1, i_query, ap );
va_end( ap );
/* No bitrate, we can't have it precisely, but we can compute
* a raw approximation with time/position */
if( i_ret && !p_sys->i_bitrate_avg )
......@@ -365,17 +365,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if( f_pos < 0.01 ||
(p_sys->i_pts + p_sys->i_time_offset) < 8000000 )
{
va_end( args_save );
return VLC_EGENERIC;
}
pi64 = (int64_t *)va_arg( args_save, int64_t * );
pi64 = (int64_t *)va_arg( args, int64_t * );
*pi64 = (p_sys->i_pts + p_sys->i_time_offset) / f_pos;
va_end( args_save );
return VLC_SUCCESS;
}
va_end( args_save );
return i_ret;
}
case DEMUX_SET_TIME:
/* FIXME TODO: implement a high precision seek (with mp3 parsing)
......@@ -384,7 +382,6 @@ 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,
p_sys->i_bitrate_avg, 1, i_query,
args );
va_end( args_save );
if( !i_ret && p_sys->i_bitrate_avg > 0 &&
(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