[FFmpeg-cvslog] avfilter/x86/vf_maskedmerge: Clear upper part of width

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Dec 23 21:57:31 2015 +0100| [e42e0b11f1df41e034c22c71656b43f402302ab5] | committer: Michael Niedermayer

avfilter/x86/vf_maskedmerge: Clear upper part of width

Fixes crash
Fixes: Ticket5055

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/x86/vf_maskedmerge.asm |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/x86/vf_maskedmerge.asm b/libavfilter/x86/vf_maskedmerge.asm
index e548d25..1970b0c 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