virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'

Browse Source 
* 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>
This commit is contained in:
Clément Bœsch 2017-03-19 15:37:07 +01:00
commit 8e950c9b42
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswscale/utils.c
View File

@ -446,15 +446,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
(8 * B + 24 * C) * (1 << 30); (8 * B + 24 * C) * (1 << 30);
} }
coeff /= (1LL<<54)/fone; coeff /= (1LL<<54)/fone;
} } else if (flags & SWS_X) {
#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) {
double A = param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0; double A = param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0;
double c; double c;