1. ffmpeg
  2. Commit a80a7131d11af69d2519377b35b58d8c8b3430af
Browse code

swscale/swscale: fix integer overflow

Should fix fate failure with clang ftrapv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c9c0451224fd7bc38b4e135e99f114f80c1ae67f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/03/24 13:01:32
Showing 1 changed files
libswscale/swscale.c
History View file @ a80a713
... ... 
@@ -208,8 +208,9 @@ static void lumRangeToJpeg16_c(int16_t *_dst, int width)
208 208 
 {
209 209 
     int i;
210 210 
     int32_t *dst = (int32_t *) _dst;
211 
-    for (i = 0; i < width; i++)
212 
-        dst[i] = (FFMIN(dst[i], 30189 << 4) * 4769 - (39057361 << 2)) >> 12;
211 
+    for (i = 0; i < width; i++) {
212 
+        dst[i] = ((int)(FFMIN(dst[i], 30189 << 4) * 4769U - (39057361 << 2))) >> 12;
213 
+    }
213 214 
 }
214 215
215 216 
 static void lumRangeFromJpeg16_c(int16_t *_dst, int width)