aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-03-05 19:44:36 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-03-06 18:23:55 +0100
commit9e0e1f9067430de1655a7b28536b5afed48bded5 (patch)
treea81b3089bbc22fe9056e296a01053c681c2d3c5c /libavcodec/x86
parent69ead9af7519796eebbc452fbbdb43af8d846173 (diff)
downloadffmpeg-9e0e1f9067430de1655a7b28536b5afed48bded5.tar.gz
x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()
Also undo the changes to ra144enc.c from previous commits. Should fix ticket #3429 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/dsputil.asm3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
index 7162034c67..d802368e1a 100644
--- a/libavcodec/x86/dsputil.asm
+++ b/libavcodec/x86/dsputil.asm
@@ -61,6 +61,9 @@ cglobal scalarproduct_int16, 3,3,3, v1, v2, order
%endif
paddd m2, m0
movd eax, m2
+%if mmsize == 8
+ emms
+%endif
RET
; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)