aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-03 20:21:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-03 20:21:56 +0100
commit8524558858b7e14bc50afa10233e0194f591ab9d (patch)
tree7e4741e5af5aa518f4dcdd87ee1c75b2a25343d7 /libswscale
parenta6f730730b82645a9d31aad0968487cb77d6946c (diff)
downloadffmpeg-8524558858b7e14bc50afa10233e0194f591ab9d.tar.gz
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Fixes Ticket4151 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/x86/rgb2rgb_template.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 7796d384bb..e71c7ebfe3 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1887,6 +1887,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"