Skip to content

V
vlc
Commit cad5438f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Setid: small fix 

Sorry, I failed my merge ;)
parent 7d68f213
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/stream_out/setid.c
View file @ cad5438f
...@@ -88,9 +88,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -88,9 +88,10 @@ 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;
p_sys = malloc( sizeof( sout_stream_sys_t ) ); p_sys = malloc( sizeof( sout_stream_sys_t ) );
if( unlikely( !p_sys ) )
return VLC_ENOMEM;
if( !p_stream->p_next ) if( !p_stream->p_next )
{ {
...@@ -102,10 +103,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -102,10 +103,8 @@ static int Open( vlc_object_t *p_this )
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg ); p_stream->p_cfg );
var_Get( p_stream, SOUT_CFG_PREFIX "id", &val ); p_sys->i_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX "id" );
p_sys->i_id = val.i_int; p_sys->i_new_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX "new-id" );
var_Get( p_stream, SOUT_CFG_PREFIX "new-id", &val );
p_sys->i_new_id = val.i_int;
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