Commit 5ab6f0fe authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "swscale: fix integer overflows in RGB pixel writing."

This reverts commit 77d88b87.

The revert fixes actual overflows and a segfault as the variables
are signed and can be negative.

Conflicts:

	libswscale/swscale.c
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5aac7615
...@@ -990,7 +990,7 @@ YUV2PACKED16WRAPPER(yuv2, rgb48, bgr48le, PIX_FMT_BGR48LE) ...@@ -990,7 +990,7 @@ YUV2PACKED16WRAPPER(yuv2, rgb48, bgr48le, PIX_FMT_BGR48LE)
* correct RGB values into the destination buffer. * correct RGB values into the destination buffer.
*/ */
static av_always_inline void static av_always_inline void
yuv2rgb_write(uint8_t *_dest, int i, unsigned Y1, unsigned Y2, yuv2rgb_write(uint8_t *_dest, int i, int Y1, int Y2,
unsigned A1, unsigned A2, unsigned A1, unsigned A2,
const void *_r, const void *_g, const void *_b, int y, const void *_r, const void *_g, const void *_b, int y,
enum PixelFormat target, int hasAlpha) enum PixelFormat target, int hasAlpha)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment