Commit 1c4110be authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3a177a9c'

* commit '3a177a9c':
  swscale: Fix an undefined behaviour
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 03963063 3a177a9c
...@@ -390,7 +390,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, ...@@ -390,7 +390,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
xDstInSrc = ((dstPos*(int64_t)xInc)>>7) - ((srcPos*0x10000LL)>>7); xDstInSrc = ((dstPos*(int64_t)xInc)>>7) - ((srcPos*0x10000LL)>>7);
for (i = 0; i < dstW; i++) { for (i = 0; i < dstW; i++) {
int xx = (xDstInSrc - ((filterSize - 2) << 16)) / (1 << 17); int xx = (xDstInSrc - ((int64_t)(filterSize - 2) << 16)) / (1 << 17);
int j; int j;
(*filterPos)[i] = xx; (*filterPos)[i] = xx;
for (j = 0; j < filterSize; j++) { for (j = 0; j < filterSize; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment