OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5aac761
)
Revert "swscale: fix integer overflows in RGB pixel writing."
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 10 Jan 2012 16:24:14 +0000
(17:24 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 10 Jan 2012 19:12:39 +0000
(20:12 +0100)
This reverts commit
77d88b872d8cbb42738ede2d4fc098c16f204236
.
The revert fixes actual overflows and a segfault as the variables
are signed and can be negative.
Conflicts:
libswscale/swscale.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.c
patch
|
blob
|
history
diff --git
a/libswscale/swscale.c
b/libswscale/swscale.c
index
3cb9bfd
..
1bf52f2
100644
(file)
--- a/
libswscale/swscale.c
+++ b/
libswscale/swscale.c
@@
-990,7
+990,7
@@
YUV2PACKED16WRAPPER(yuv2, rgb48, bgr48le, PIX_FMT_BGR48LE)
* correct RGB values into the destination buffer.
*/
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,
const void *_r, const void *_g, const void *_b, int y,
enum PixelFormat target, int hasAlpha)