diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 05:01:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 05:01:32 +0100 |
| commit | c9c0451224fd7bc38b4e135e99f114f80c1ae67f (patch) | |
| tree | b5117807c46e1854372107741cb34bc3b5b2178a /libswscale | |
| parent | 8683fa541bdf2998f6167b43b72b09f701fec573 (diff) | |
| download | ffmpeg-c9c0451224fd7bc38b4e135e99f114f80c1ae67f.tar.gz | |
swscale/swscale: fix integer overflow
Should fix fate failure with clang ftrapv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1d623e77a2..f529331f0f 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -208,8 +208,9 @@ static void lumRangeToJpeg16_c(int16_t *_dst, int width) { int i; int32_t *dst = (int32_t *) _dst; - for (i = 0; i < width; i++) - dst[i] = (FFMIN(dst[i], 30189 << 4) * 4769 - (39057361 << 2)) >> 12; + for (i = 0; i < width; i++) { + dst[i] = ((int)(FFMIN(dst[i], 30189 << 4) * 4769U - (39057361 << 2))) >> 12; + } } static void lumRangeFromJpeg16_c(int16_t *_dst, int width) |