Commit 43a8115c authored by Laurent Aimar's avatar Laurent Aimar

* all: cosmetics.

parent 179f1381
...@@ -90,7 +90,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -90,7 +90,7 @@ static int Open( vlc_object_t *p_this )
sout_stream_sys_t *p_sys; sout_stream_sys_t *p_sys;
vlc_value_t val; vlc_value_t val;
sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg ); p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) ); p_sys = malloc( sizeof( sout_stream_sys_t ) );
......
...@@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this )
sout_stream_t *s; sout_stream_t *s;
msg_Dbg( p_stream, " * adding `%s'", p_cfg->psz_value ); msg_Dbg( p_stream, " * adding `%s'", p_cfg->psz_value );
s = sout_stream_new( p_stream->p_sout, p_cfg->psz_value ); s = sout_StreamNew( p_stream->p_sout, p_cfg->psz_value );
if( s ) if( s )
{ {
...@@ -144,7 +144,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -144,7 +144,7 @@ static void Close( vlc_object_t * p_this )
msg_Dbg( p_stream, "closing a duplication" ); msg_Dbg( p_stream, "closing a duplication" );
for( i = 0; i < p_sys->i_nb_streams; i++ ) for( i = 0; i < p_sys->i_nb_streams; i++ )
{ {
sout_stream_delete( p_sys->pp_streams[i] ); sout_StreamDelete( p_sys->pp_streams[i] );
if( p_sys->ppsz_select[i] ) if( p_sys->ppsz_select[i] )
{ {
free( p_sys->ppsz_select[i] ); free( p_sys->ppsz_select[i] );
......
...@@ -147,7 +147,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -147,7 +147,7 @@ static int Open( vlc_object_t *p_this )
sout_stream_sys_t *p_sys; sout_stream_sys_t *p_sys;
vlc_value_t val; vlc_value_t val;
sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); sout_CfgParse( 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 ) );
p_sys->i_count = 0; p_sys->i_count = 0;
......
...@@ -76,7 +76,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -76,7 +76,7 @@ static int Open( vlc_object_t *p_this )
sout_stream_sys_t *p_sys; sout_stream_sys_t *p_sys;
p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) ); p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next ); p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
if( p_sys->p_out == NULL ) if( p_sys->p_out == NULL )
{ {
free( p_sys ); free( p_sys );
...@@ -108,7 +108,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -108,7 +108,7 @@ static void Close( vlc_object_t * p_this )
} }
free( p_sys->id ); free( p_sys->id );
sout_stream_delete( p_sys->p_out ); sout_StreamDelete( p_sys->p_out );
free( p_sys ); free( p_sys );
} }
......
...@@ -227,7 +227,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -227,7 +227,7 @@ static int Open( vlc_object_t *p_this )
sout_stream_sys_t *p_sys; sout_stream_sys_t *p_sys;
vlc_value_t val; vlc_value_t val;
sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); sout_CfgParse( 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 ) );
......
...@@ -135,7 +135,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -135,7 +135,7 @@ static int Open( vlc_object_t *p_this )
char *psz_mux_byext = NULL; char *psz_mux_byext = NULL;
sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg ); p_stream->p_cfg );
var_Get( p_stream, SOUT_CFG_PREFIX "access", &val ); var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
......
...@@ -251,7 +251,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -251,7 +251,7 @@ static int Open( vlc_object_t *p_this )
p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) ); p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next ); p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
if( !p_sys->p_out ) if( !p_sys->p_out )
{ {
msg_Err( p_stream, "cannot create chain" ); msg_Err( p_stream, "cannot create chain" );
...@@ -262,7 +262,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -262,7 +262,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_input_has_b_frames = VLC_FALSE; p_sys->b_input_has_b_frames = VLC_FALSE;
p_sys->i_output_pts = 0; p_sys->i_output_pts = 0;
sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg ); p_stream->p_cfg );
/* Audio transcoding parameters */ /* Audio transcoding parameters */
...@@ -272,8 +272,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -272,8 +272,8 @@ static int Open( vlc_object_t *p_this )
if( val.psz_string && *val.psz_string ) if( val.psz_string && *val.psz_string )
{ {
char *psz_next; char *psz_next;
psz_next = sout_cfg_parser( &p_sys->psz_aenc, &p_sys->p_audio_cfg, psz_next = sout_CfgCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
val.psz_string ); val.psz_string );
if( psz_next ) free( psz_next ); if( psz_next ) free( psz_next );
} }
if( val.psz_string ) free( val.psz_string ); if( val.psz_string ) free( val.psz_string );
...@@ -312,8 +312,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -312,8 +312,8 @@ static int Open( vlc_object_t *p_this )
if( val.psz_string && *val.psz_string ) if( val.psz_string && *val.psz_string )
{ {
char *psz_next; char *psz_next;
psz_next = sout_cfg_parser( &p_sys->psz_venc, &p_sys->p_video_cfg, psz_next = sout_CfgCreate( &p_sys->psz_venc, &p_sys->p_video_cfg,
val.psz_string ); val.psz_string );
if( psz_next ) free( psz_next ); if( psz_next ) free( psz_next );
} }
if( val.psz_string ) free( val.psz_string ); if( val.psz_string ) free( val.psz_string );
...@@ -382,7 +382,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -382,7 +382,7 @@ static void Close( 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 = p_stream->p_sys; sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_delete( p_sys->p_out ); sout_StreamDelete( p_sys->p_out );
while( p_sys->p_audio_cfg != NULL ) while( p_sys->p_audio_cfg != NULL )
{ {
......
...@@ -80,7 +80,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -80,7 +80,7 @@ static int Open( vlc_object_t *p_this )
char *val; char *val;
p_sys = malloc( sizeof( sout_stream_sys_t ) ); p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next ); p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
p_sys->i_vbitrate = 0; p_sys->i_vbitrate = 0;
...@@ -142,7 +142,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -142,7 +142,7 @@ static void Close( 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 = p_stream->p_sys; sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_delete( p_sys->p_out ); sout_StreamDelete( p_sys->p_out );
free( p_sys ); free( p_sys );
} }
......
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