videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

filter_chain: remove always NULL parameter from AppendFilter

This commit is contained in:
Steve Lhomme 2019-11-07 13:04:18 +01:00
parent c854beb047
commit 5f29d983b2
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/vlc_filter.h
View File

@ -369,12 +369,11 @@ VLC_API void filter_chain_Clear(filter_chain_t *);
*
* \param chain filter chain to append a filter to
* \param name filter name
* \param fmt_in filter input format
* \param fmt_out filter output format
* \return a pointer to the filter or NULL on error
*/
VLC_API filter_t *filter_chain_AppendFilter(filter_chain_t *chain,
const char *name, config_chain_t *cfg, const es_format_t *fmt_in,
const char *name, config_chain_t *cfg,
const es_format_t *fmt_out);
/**

4
modules/stream_out/transcode/video.c
View File

@ -327,13 +327,13 @@ static int transcode_video_filters_init( sout_stream_t *p_stream,
filter_chain_AppendFilter( id->p_f_chain,
p_cfg->video.psz_deinterlace,
p_cfg->video.p_deinterlace_cfg,
NULL, p_src );
p_src );
p_src = filter_chain_GetFmtOut( id->p_f_chain );
}
if( b_master_sync )
{
filter_chain_AppendFilter( id->p_f_chain, "fps", NULL, NULL, p_dst );
filter_chain_AppendFilter( id->p_f_chain, "fps", NULL, p_dst );
p_src = filter_chain_GetFmtOut( id->p_f_chain );
}

4
modules/video_chroma/chain.c
View File

@ -395,7 +395,7 @@ static int BuildFilterChain( filter_t *p_filter )
p_sys->p_video_filter =
filter_chain_AppendFilter( p_sys->p_chain,
p_filter->psz_name, p_filter->p_cfg,
NULL, &fmt_mid );
&fmt_mid );
if( p_sys->p_video_filter )
{
filter_AddProxyCallbacks( p_filter,
@ -532,7 +532,7 @@ static filter_t * AppendTransform( filter_chain_t *p_chain, const es_format_t *p
snprintf( config, 100, "transform{type=%s}", type );
char *next = config_ChainCreate( &name, &cfg, config );
filter_t *p_filter = filter_chain_AppendFilter( p_chain, name, cfg, NULL, p_fmt2 );
filter_t *p_filter = filter_chain_AppendFilter( p_chain, name, cfg, p_fmt2 );
config_ChainDestroy(cfg);
free(name);

7
src/misc/filter_chain.c
View File

@ -271,10 +271,10 @@ error:
filter_t *filter_chain_AppendFilter( filter_chain_t *chain,
const char *name, config_chain_t *cfg,
const es_format_t *fmt_in, const es_format_t *fmt_out )
const es_format_t *fmt_out )
{
return filter_chain_AppendInner( chain, name, chain->filter_cap, cfg,
fmt_in, fmt_out );
NULL, fmt_out );
}
int filter_chain_AppendConverter( filter_chain_t *chain,
@ -335,8 +335,7 @@ int filter_chain_AppendFromString( filter_chain_t *chain, const char *str )
free( buf );
buf = next;
filter_t *filter = filter_chain_AppendFilter( chain, name, cfg,
NULL, NULL );
filter_t *filter = filter_chain_AppendFilter( chain, name, cfg, NULL );
if( cfg )
config_ChainDestroy( cfg );

2
src/video_output/video_output.c
View File

@ -828,7 +828,7 @@ static void ThreadChangeFilters(vout_thread_t *vout,
vout_filter_t *e = vlc_array_item_at_index(array, i);
msg_Dbg(vout, "Adding '%s' as %s", e->name, a == 0 ? "static" : "interactive");
filter_t *filter = filter_chain_AppendFilter(chain, e->name, e->cfg,
NULL, NULL);
NULL);
if (!filter)
{
msg_Err(vout, "Failed to add filter '%s'", e->name);