Commit 8641c42f authored by Rémi Duraffort's avatar Rémi Duraffort

sout_es: use var_GetString.

parent 5a960f61
...@@ -149,7 +149,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -149,7 +149,6 @@ static int Open( vlc_object_t *p_this )
{ {
sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys; sout_stream_sys_t *p_sys;
vlc_value_t val;
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) ); p_sys = malloc( sizeof( sout_stream_sys_t ) );
...@@ -158,26 +157,17 @@ static int Open( vlc_object_t *p_this ) ...@@ -158,26 +157,17 @@ static int Open( vlc_object_t *p_this )
p_sys->i_count_audio = 0; p_sys->i_count_audio = 0;
p_sys->i_count_video = 0; p_sys->i_count_video = 0;
var_Get( p_stream, SOUT_CFG_PREFIX "access", &val ); p_sys->psz_access = var_GetString( p_stream, SOUT_CFG_PREFIX "access" );
p_sys->psz_access = val.psz_string; p_sys->psz_access_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "access-audio" );
var_Get( p_stream, SOUT_CFG_PREFIX "access-audio", &val ); p_sys->psz_access_video = var_GetString( p_stream, SOUT_CFG_PREFIX "access-video" );
p_sys->psz_access_audio = val.psz_string;
var_Get( p_stream, SOUT_CFG_PREFIX "access-video", &val ); p_sys->psz_mux = var_GetString( p_stream, SOUT_CFG_PREFIX "mux" );
p_sys->psz_access_video = val.psz_string; p_sys->psz_mux_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-audio" );
p_sys->psz_mux_video = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-video" );
var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val );
p_sys->psz_mux = val.psz_string; p_sys->psz_dst = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" );
var_Get( p_stream, SOUT_CFG_PREFIX "mux-audio", &val ); p_sys->psz_dst_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-audio" );
p_sys->psz_mux_audio = val.psz_string; p_sys->psz_dst_video = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-video" );
var_Get( p_stream, SOUT_CFG_PREFIX "mux-video", &val );
p_sys->psz_mux_video = val.psz_string;
var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
p_sys->psz_dst = val.psz_string;
var_Get( p_stream, SOUT_CFG_PREFIX "dst-audio", &val );
p_sys->psz_dst_audio = val.psz_string;
var_Get( p_stream, SOUT_CFG_PREFIX "dst-video", &val );
p_sys->psz_dst_video = val.psz_string;
p_stream->pf_add = Add; p_stream->pf_add = Add;
p_stream->pf_del = Del; p_stream->pf_del = Del;
......
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