diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:46:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:46:08 +0200 |
| commit | 0597f052372b9e5877af7ad8b1e632d511931db6 (patch) | |
| tree | bb37ebf66a920fb6059b2a159a8dca21e3ca3374 | |
| parent | 227ac71a60937785a5e5e21618a929ee3b887015 (diff) | |
| parent | 9a2387cfb1a99e4b00593c22074929cdc73410f0 (diff) | |
| download | ffmpeg-0597f052372b9e5877af7ad8b1e632d511931db6.tar.gz | |
Merge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1
* commit '9a2387cfb1a99e4b00593c22074929cdc73410f0':
swscale: Fix an undefined behaviour
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 89bf0da59b..55ade89fc4 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -342,7 +342,7 @@ static int initFilter(int16_t **outFilter, int32_t **filterPos, xDstInSrc = xInc - 0x10000; 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++) { |