mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
* all: cosmetics.
This commit is contained in:
parent
179f1381ce
commit
43a8115c06
@ -90,7 +90,7 @@ static int Open( vlc_object_t *p_this )
|
||||
sout_stream_sys_t *p_sys;
|
||||
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_sys = malloc( sizeof( sout_stream_sys_t ) );
|
||||
|
@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this )
|
||||
sout_stream_t *s;
|
||||
|
||||
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 )
|
||||
{
|
||||
@ -144,7 +144,7 @@ static void Close( vlc_object_t * p_this )
|
||||
msg_Dbg( p_stream, "closing a duplication" );
|
||||
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] )
|
||||
{
|
||||
free( p_sys->ppsz_select[i] );
|
||||
|
@ -147,7 +147,7 @@ static int Open( vlc_object_t *p_this )
|
||||
sout_stream_sys_t *p_sys;
|
||||
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->i_count = 0;
|
||||
|
@ -76,7 +76,7 @@ static int Open( vlc_object_t *p_this )
|
||||
sout_stream_sys_t *p_sys;
|
||||
|
||||
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 )
|
||||
{
|
||||
free( p_sys );
|
||||
@ -108,7 +108,7 @@ static void Close( vlc_object_t * p_this )
|
||||
}
|
||||
free( p_sys->id );
|
||||
|
||||
sout_stream_delete( p_sys->p_out );
|
||||
sout_StreamDelete( p_sys->p_out );
|
||||
free( p_sys );
|
||||
}
|
||||
|
||||
|
@ -227,7 +227,7 @@ static int Open( vlc_object_t *p_this )
|
||||
sout_stream_sys_t *p_sys;
|
||||
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 ) );
|
||||
|
||||
|
@ -135,7 +135,7 @@ static int Open( vlc_object_t *p_this )
|
||||
|
||||
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 );
|
||||
|
||||
var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
|
||||
|
@ -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->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 )
|
||||
{
|
||||
msg_Err( p_stream, "cannot create chain" );
|
||||
@ -262,7 +262,7 @@ static int Open( vlc_object_t *p_this )
|
||||
p_sys->b_input_has_b_frames = VLC_FALSE;
|
||||
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 );
|
||||
|
||||
/* Audio transcoding parameters */
|
||||
@ -272,8 +272,8 @@ static int Open( vlc_object_t *p_this )
|
||||
if( val.psz_string && *val.psz_string )
|
||||
{
|
||||
char *psz_next;
|
||||
psz_next = sout_cfg_parser( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
|
||||
val.psz_string );
|
||||
psz_next = sout_CfgCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
|
||||
val.psz_string );
|
||||
if( psz_next ) free( psz_next );
|
||||
}
|
||||
if( val.psz_string ) free( val.psz_string );
|
||||
@ -312,8 +312,8 @@ static int Open( vlc_object_t *p_this )
|
||||
if( val.psz_string && *val.psz_string )
|
||||
{
|
||||
char *psz_next;
|
||||
psz_next = sout_cfg_parser( &p_sys->psz_venc, &p_sys->p_video_cfg,
|
||||
val.psz_string );
|
||||
psz_next = sout_CfgCreate( &p_sys->psz_venc, &p_sys->p_video_cfg,
|
||||
val.psz_string );
|
||||
if( psz_next ) free( psz_next );
|
||||
}
|
||||
if( val.psz_string ) free( val.psz_string );
|
||||
@ -382,7 +382,7 @@ static void Close( vlc_object_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_delete( p_sys->p_out );
|
||||
sout_StreamDelete( p_sys->p_out );
|
||||
|
||||
while( p_sys->p_audio_cfg != NULL )
|
||||
{
|
||||
|
@ -80,7 +80,7 @@ static int Open( vlc_object_t *p_this )
|
||||
char *val;
|
||||
|
||||
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;
|
||||
|
||||
@ -142,7 +142,7 @@ static void Close( vlc_object_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_delete( p_sys->p_out );
|
||||
sout_StreamDelete( p_sys->p_out );
|
||||
free( p_sys );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user