Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'

* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libswscale/utils.c
index caae63ac2b19ca0c9a3822aa006f3b39790a0a9d,c4fb7451ebb2fbe52126bee5b3ae71d5a2b6d6d3..4c9b53bbeb58dc47f73e889f0ca872a1fa3d7f28
--- 1/libswscale/utils.c
--- 2/libswscale/utils.c
+++ b/libswscale/utils.c
@@@ -445,16 -370,9 +445,8 @@@ static av_cold int initFilter(int16_t *
                                      (-12 * B - 48 * C) * d   +
                                        (8 * B + 24 * C) * (1 << 30);
                      }
 -                    coeff *= fone >> (30 + 24);
 -                }
 -                else if (flags & SWS_X) {
 +                    coeff /= (1LL<<54)/fone;
-                 }
- #if 0
-                 else if (flags & SWS_X) {
-                     double p  = param ? param * 0.01 : 0.3;
-                     coeff     = d ? sin(d * M_PI) / (d * M_PI) : 1.0;
-                     coeff    *= pow(2.0, -p * d * d);
-                 }
- #endif
-                 else if (flags & SWS_X) {
++                } else if (flags & SWS_X) {
                      double A = param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0;
                      double c;