Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08': swscale: Fix an undefined behaviour Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 1c4110be90
parent 039630631e 3a177a9cca
commit 1c4110be90
1 changed files with 1 additions and 1 deletions
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@ -390,7 +390,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,

        xDstInSrc = ((dstPos*(int64_t)xInc)>>7) - ((srcPos*0x10000LL)>>7);
        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;
            (*filterPos)[i] = xx;
            for (j = 0; j < filterSize; j++) {