diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:37:07 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:40:03 +0100 |
| commit | 8e950c9b4235bb66f3bf53608417c7cbc8148740 (patch) | |
| tree | ca635db4040eda218bd41d606aef2066fe8ada0f /libswscale | |
| parent | efcba5a06acff1276ef30142ef2f881307c68248 (diff) | |
| parent | aa37d2bf4505afc106e2a23c44afc722bb204a8e (diff) | |
| download | ffmpeg-8e950c9b4235bb66f3bf53608417c7cbc8148740.tar.gz | |
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>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index caae63ac2b..4c9b53bbeb 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -446,15 +446,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, (8 * B + 24 * C) * (1 << 30); } 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; |