[FFmpeg-cvslog] swscale/x86/rgb2rgb_template: Do not crash on misaligend stride

[Michael Niedermayer]

ffmpeg | branch: release/2.0 | Michael Niedermayer <michael at niedermayer.cc> | Tue Dec 15 02:06:04 2015 +0100| [f23efdd2401d452dcfcc004086283ebdc36cf7c6] | committer: Carl Eugen Hoyos

swscale/x86/rgb2rgb_template: Do not crash on misaligend stride

Fixes Ticket5013

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 80bfce35ccd11458e97f68f417fc094c5347070c)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f23efdd2401d452dcfcc004086283ebdc36cf7c6
---

 libswscale/x86/rgb2rgb_template.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 80e5670..bfcaead 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"