[vlc-commits] transcode: simplify test in transcode_video_set_conversions

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Sep 24 10:49:37 2020 +0200| [9550fe65764867dc72752fcedbbfd001211c2989] | committer: Steve Lhomme

transcode: simplify test in transcode_video_set_conversions

If b_do_orient is true we returned VLC_EGENERIC a few lines above.
So b_do_orient is false, so we will return VLC_SUCCESS no matter what the
values of b_do_chroma and b_do_scale are.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9550fe65764867dc72752fcedbbfd001211c2989
---

 modules/stream_out/transcode/video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 16ceb01af9..025a25e44e 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -324,7 +324,7 @@ static int transcode_video_set_conversions( sout_stream_t *p_stream,
 
         const es_format_t *p_tmpdst = p_dst;
 
-        if( ! (b_do_scale || b_do_chroma || b_do_orient) )
+        if( !b_do_orient )
             return VLC_SUCCESS;
 
         msg_Dbg( p_stream, "adding (scale %d,chroma %d, orient %d) converters",