diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-15 02:06:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-15 02:32:23 +0100 |
| commit | 80bfce35ccd11458e97f68f417fc094c5347070c (patch) | |
| tree | b6fa09e50e80c4d9fc013c0466710e16bb6d0dc0 /libswscale/x86 | |
| parent | 06987dab972e275a70ea961be27bc12ff531da75 (diff) | |
| download | ffmpeg-streaming-80bfce35ccd11458e97f68f417fc094c5347070c.zip ffmpeg-streaming-80bfce35ccd11458e97f68f417fc094c5347070c.tar.gz | |
swscale/x86/rgb2rgb_template: Do not crash on misaligend stride
Fixes Ticket5013
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index e97ba4f..6524461 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1887,8 +1887,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" @@ -1908,6 +1910,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui : "memory", XMM_CLOBBERS("xmm0", "xmm1", "xmm2",) "%"REG_a ); #else + ) __asm__( "xor %%"REG_a", %%"REG_a" \n\t" "1: \n\t" |
