diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:36:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:36:54 +0200 |
| commit | 1c4110be90380fbe7c6bac1306616b79325107ed (patch) | |
| tree | b5212cd3ed67cc8cea1dfcaf1d874199ed095c27 | |
| parent | 039630631e96cc04d09101acf71756174ce00dad (diff) | |
| parent | 3a177a9cca924e097265b32f9282814f6b653e08 (diff) | |
| download | ffmpeg-1c4110be90380fbe7c6bac1306616b79325107ed.tar.gz | |
Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'
* commit '3a177a9cca924e097265b32f9282814f6b653e08':
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 28de7b6e81..f5cd1b41cb 100644 --- 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++) { |