aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-23 21:57:31 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-23 22:38:15 +0100
commite42e0b11f1df41e034c22c71656b43f402302ab5 (patch)
tree345456958486d848de651e097cda3b11692523ce
parent3689b58a5a1c99d14ca5b2d9b82db8793d328996 (diff)
downloadffmpeg-e42e0b11f1df41e034c22c71656b43f402302ab5.tar.gz
avfilter/x86/vf_maskedmerge: Clear upper part of width
Fixes crash Fixes: Ticket5055 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavfilter/x86/vf_maskedmerge.asm1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/x86/vf_maskedmerge.asm b/libavfilter/x86/vf_maskedmerge.asm
index e548d258e1..1970b0c6d8 100644
--- a/libavfilter/x86/vf_maskedmerge.asm
+++ b/libavfilter/x86/vf_maskedmerge.asm
@@ -35,6 +35,7 @@ cglobal maskedmerge8, 10, 11, 7, 0, bsrc, osrc, msrc, dst, blinesize, olinesize,
mova m4, [pw_256]
mova m5, [pw_128]
pxor m6, m6
+ movsxdifnidn wq, wd
add bsrcq, wq
add osrcq, wq
add msrcq, wq