diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-15 02:06:04 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-12-15 11:21:41 +0100 |
| commit | 00c016a5f7d23eb790abd3c4d1325a6ebc143f2c (patch) | |
| tree | 76d7b6a9d2bc35bee3d06d2d12c54eb38e3eec8b | |
| parent | 65f4425ad58072dcb5fbe6ce5d922de7f50a2c81 (diff) | |
| download | ffmpeg-00c016a5f7d23eb790abd3c4d1325a6ebc143f2c.tar.gz | |
swscale/x86/rgb2rgb_template: Do not crash on misaligend stride
Fixes Ticket5013
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 80bfce35ccd11458e97f68f417fc094c5347070c)
| -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 80e5670465..bfcaead9d0 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -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" |