RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2015-12-15 02:06:04 +01:00 committed by Carl Eugen Hoyos
parent 65f4425ad5
commit 00c016a5f7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libswscale/x86/rgb2rgb_template.c
View File

@ -1874,8 +1874,10 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
for (h=0; h < height; h++) {
int w;
if (width >= 16)
if (width >= 16
#if COMPILE_TEMPLATE_SSE2
&& !((((intptr_t)src1) | ((intptr_t)src2) | ((intptr_t)dest))&15)
)
__asm__(
"xor %%"REG_a", %%"REG_a" \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""
);
#else
)
__asm__(
"xor %%"REG_a", %%"REG_a" \n\t"
"1: \n\t"