ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sun Mar 19 15:37:07 2017 +0100| [8e950c9b4235bb66f3bf53608417c7cbc8148740] | committer: Clément Bœsch
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 <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e950c9b4235bb66f3bf53608417c7cbc8148740 --- libswscale/utils.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index caae63a..4c9b53b 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; ====================================================================== diff --cc libswscale/utils.c index caae63a,c4fb745..4c9b53b --- a/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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
