ffmpeg | branch: release/2.2 | James Almer <jamr...@gmail.com> | Wed Mar 5
19:44:36 2014 -0300| [16b5df17ea9d7b9b0b10b1effa776177ac69d88c] | committer:
Michael Niedermayer
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 <jamr...@gmail.com>
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 9e0e1f9067430de1655a7b28536b5afed48bded5)
Conflicts:
libavcodec/ra144enc.c
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16b5df17ea9d7b9b0b10b1effa776177ac69d88c
---
libavcodec/ra144enc.c | 1 -
libavcodec/x86/dsputil.asm | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c
index 0db6032..3f4be67 100644
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@@ -34,7 +34,6 @@
#include "celp_filters.h"
#include "ra144.h"
-
static av_cold int ra144_encode_close(AVCodecContext *avctx)
{
RA144Context *ractx = avctx->priv_data;
diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
index 7162034..d802368 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)
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
