[FFmpeg-cvslog] swscale/input: fix harmless integer overflow
Michael Niedermayer
git at videolan.org
Mon Jun 16 23:34:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 16 22:46:46 2014 +0200| [293d5d7a8e12e38bf70b51f6aa70321e079ffa64] | committer: Michael Niedermayer
swscale/input: fix harmless integer overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=293d5d7a8e12e38bf70b51f6aa70321e079ffa64
---
libswscale/input.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libswscale/input.c b/libswscale/input.c
index 3a2a124..6a39a30 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -324,8 +324,8 @@ static av_always_inline void rgb16_32ToUV_half_c_template(int16_t *dstU,
maskb |= maskb << 1;
maskg |= maskg << 1;
for (i = 0; i < width; i++) {
- int px0 = input_pixel(2 * i + 0) >> shp;
- int px1 = input_pixel(2 * i + 1) >> shp;
+ unsigned px0 = input_pixel(2 * i + 0) >> shp;
+ unsigned px1 = input_pixel(2 * i + 1) >> shp;
int b, r, g = (px0 & maskgx) + (px1 & maskgx);
int rb = px0 + px1 - g;
More information about the ffmpeg-cvslog
mailing list