[FFmpeg-cvslog] swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Michael Niedermayer git at videolan.org
Thu Mar 12 18:05:29 CET 2015


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  3 20:21:56 2014 +0100| [5a1061b4ad41609039ac0bcc7d127bb1ad1cd29d] | committer: Michael Niedermayer

swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8524558858b7e14bc50afa10233e0194f591ab9d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswscale/x86/rgb2rgb_template.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 3bca43c..9e28f4b 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1959,6 +1959,7 @@ 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 COMPILE_TEMPLATE_SSE2
         __asm__(
             "xor              %%"REG_a", %%"REG_a"  \n\t"



More information about the ffmpeg-cvslog mailing list