diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:44:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:44:08 +0200 |
| commit | 3a67865963de4b0fcbfd201f8894f6c48d5ca9c1 (patch) | |
| tree | 17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7 | |
| parent | 3fb754712c8a680f32f9cba43d6176891ea3d240 (diff) | |
| parent | a56a9e65c6a17dd8b6303dd45bdc3e3368093092 (diff) | |
| download | ffmpeg-3a67865963de4b0fcbfd201f8894f6c48d5ca9c1.tar.gz | |
Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2
* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092':
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 e4479925e6..fb4576a626 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -389,7 +389,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++) { |