vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Tue Dec 11 15:16:22 2018 +0100| [22c46739c53458a29056a58049938326f0453dd9] | committer: Steve Lhomme
video: don't do else after a return > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=22c46739c53458a29056a58049938326f0453dd9 --- modules/stream_out/transcode/video.c | 5 ++--- modules/video_chroma/chain.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index bdb4f8fe32..90f32a9400 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -47,10 +47,9 @@ static const video_format_t* filtered_video_format( sout_stream_id_sys_t *id, assert( id && p_pic ); if( id->p_uf_chain ) return &filter_chain_GetFmtOut( id->p_uf_chain )->video; - else if( id->p_f_chain ) + if( id->p_f_chain ) return &filter_chain_GetFmtOut( id->p_f_chain )->video; - else - return &p_pic->format; + return &p_pic->format; } static int video_update_format_decoder( decoder_t *p_dec ) diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c index 242034bda0..a430054160 100644 --- a/modules/video_chroma/chain.c +++ b/modules/video_chroma/chain.c @@ -197,7 +197,7 @@ static int Activate( filter_t *p_filter, int (*pf_build)(filter_t *) ) free( p_sys ); return VLC_EGENERIC; } - else if( p_filter->b_allow_fmt_out_change ) + if( p_filter->b_allow_fmt_out_change ) { es_format_Clean( &p_filter->fmt_out ); es_format_Copy( &p_filter->fmt_out, _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits