[FFmpeg-cvslog] avfilter/vf_colorchannelmixer: simplify code a little

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Sep 26 17:04:23 2021 +0200| [e4327f97b19360dbc155a72493ad749975113d50] | committer: Paul B Mahol

avfilter/vf_colorchannelmixer: simplify code a little

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4327f97b19360dbc155a72493ad749975113d50
---

 libavfilter/vf_colorchannelmixer.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c
index 76722523a7..e51f9d2d68 100644
--- a/libavfilter/vf_colorchannelmixer.c
+++ b/libavfilter/vf_colorchannelmixer.c
@@ -145,10 +145,6 @@ static av_always_inline int filter_slice_rgba_planar(AVFilterContext *ctx, void
             const uint8_t bin = srcb[j];
             const uint8_t ain = have_alpha ? srca[j] : 0;
             int rout, gout, bout;
-            float lin;
-
-            if (pl)
-                lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
 
             rout = s->lut[R][R][rin] +
                    s->lut[R][G][gin] +
@@ -164,6 +160,7 @@ static av_always_inline int filter_slice_rgba_planar(AVFilterContext *ctx, void
                    (have_alpha == 1 ? s->lut[B][A][ain] : 0);
 
             if (pl) {
+                float lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
                 float frout = rout / sr;
                 float fgout = gout / sg;
                 float fbout = bout / sb;
@@ -231,10 +228,6 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi
             const uint16_t bin = srcb[j];
             const uint16_t ain = have_alpha ? srca[j] : 0;
             int rout, gout, bout;
-            float lin;
-
-            if (pl)
-                lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
 
             rout = s->lut[R][R][rin] +
                    s->lut[R][G][gin] +
@@ -250,6 +243,7 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi
                    (have_alpha == 1 ? s->lut[B][A][ain] : 0);
 
             if (pl) {
+                float lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
                 float frout = rout / sr;
                 float fgout = gout / sg;
                 float fbout = bout / sb;
@@ -418,10 +412,6 @@ static av_always_inline int filter_slice_rgba_packed(AVFilterContext *ctx, void
             const uint8_t bin = src[j + boffset];
             const uint8_t ain = src[j + aoffset];
             int rout, gout, bout;
-            float lin;
-
-            if (pl)
-                lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
 
             rout = s->lut[R][R][rin] +
                    s->lut[R][G][gin] +
@@ -437,6 +427,7 @@ static av_always_inline int filter_slice_rgba_packed(AVFilterContext *ctx, void
                    (have_alpha == 1 ? s->lut[B][A][ain] : 0);
 
             if (pl) {
+                float lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
                 float frout = rout / sr;
                 float fgout = gout / sg;
                 float fbout = bout / sb;
@@ -500,10 +491,6 @@ static av_always_inline int filter_slice_rgba16_packed(AVFilterContext *ctx, voi
             const uint16_t bin = src[j + boffset];
             const uint16_t ain = src[j + aoffset];
             int rout, gout, bout;
-            float lin;
-
-            if (pl)
-                lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
 
             rout = s->lut[R][R][rin] +
                    s->lut[R][G][gin] +
@@ -519,6 +506,7 @@ static av_always_inline int filter_slice_rgba16_packed(AVFilterContext *ctx, voi
                    (have_alpha == 1 ? s->lut[B][A][ain] : 0);
 
             if (pl) {
+                float lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin);
                 float frout = rout / sr;
                 float fgout = gout / sg;
                 float fbout = bout / sb;