diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-09-28 04:26:02 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-01 22:29:20 +0200 |
| commit | 1101cf30ec1597694d4d4b27cab2ea25aa57945c (patch) | |
| tree | e78f099a76db81fc385dd0d6869597cb02d9febb | |
| parent | a79bfc2222f16763ebc0c709e18eb39088f456d7 (diff) | |
| download | ffmpeg-1101cf30ec1597694d4d4b27cab2ea25aa57945c.tar.gz | |
swscale/utils: Fix invalid left shifts of negative numbers
Affected the FATE-tests vsynth_lena-dv-411, vsynth1-dv-411,
vsynth2-dv-411 and hevc-paramchange-yuv420p.yuv420p10.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e2646e23be69bdef1e41d4decee1a4298701b8d1)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index d5913ed733..2484cdf8d7 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -384,7 +384,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, (*filterPos)[i] = xx; // bilinear upscale / linear interpolate / area averaging for (j = 0; j < filterSize; j++) { - int64_t coeff= fone - FFABS(((int64_t)xx<<16) - xDstInSrc)*(fone>>16); + int64_t coeff = fone - FFABS((int64_t)xx * (1 << 16) - xDstInSrc) * (fone >> 16); if (coeff < 0) coeff = 0; filter[i * filterSize + j] = coeff; |