generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()

Browse Source 
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>
(cherry picked from commit 9e0e1f9067)

Conflicts:

	libavcodec/ra144enc.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer
2014-03-05 19:44:36 -03:00
committed by Michael Niedermayer
parent 70dc7bb893
commit 9b9048a3dd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ra144enc.c
View File

@@ -34,7 +34,6 @@
#include "celp_filters.h" #include "celp_filters.h"
#include "ra144.h" #include "ra144.h"
static av_cold int ra144_encode_close(AVCodecContext *avctx) static av_cold int ra144_encode_close(AVCodecContext *avctx)
{ {
RA144Context *ractx = avctx->priv_data; RA144Context *ractx = avctx->priv_data;

3
libavcodec/x86/dsputil.asm
View File

@@ -61,6 +61,9 @@ cglobal scalarproduct_int16, 3,3,3, v1, v2, order
%endif %endif
paddd m2, m0 paddd m2, m0
movd eax, m2 movd eax, m2
%if mmsize == 8
emms
%endif
RET RET
; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul) ; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)