mirror of https://git.ffmpeg.org/ffmpeg.git
swscale/x86/rgb2rgb_template: Do not crash on misaligend stride
Fixes Ticket5013
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 80bfce35cc
)
This commit is contained in:
parent
65f4425ad5
commit
00c016a5f7
|
@ -1874,8 +1874,10 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
|
||||||
for (h=0; h < height; h++) {
|
for (h=0; h < height; h++) {
|
||||||
int w;
|
int w;
|
||||||
|
|
||||||
if (width >= 16)
|
if (width >= 16
|
||||||
#if COMPILE_TEMPLATE_SSE2
|
#if COMPILE_TEMPLATE_SSE2
|
||||||
|
&& !((((intptr_t)src1) | ((intptr_t)src2) | ((intptr_t)dest))&15)
|
||||||
|
)
|
||||||
__asm__(
|
__asm__(
|
||||||
"xor %%"REG_a", %%"REG_a" \n\t"
|
"xor %%"REG_a", %%"REG_a" \n\t"
|
||||||
"1: \n\t"
|
"1: \n\t"
|
||||||
|
@ -1895,6 +1897,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
|
||||||
: "memory", "%"REG_a""
|
: "memory", "%"REG_a""
|
||||||
);
|
);
|
||||||
#else
|
#else
|
||||||
|
)
|
||||||
__asm__(
|
__asm__(
|
||||||
"xor %%"REG_a", %%"REG_a" \n\t"
|
"xor %%"REG_a", %%"REG_a" \n\t"
|
||||||
"1: \n\t"
|
"1: \n\t"
|
||||||
|
|
Loading…
Reference in New Issue