aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-18 02:09:46 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-18 02:54:06 +0200
commitd5b068d44b4bf42951611a92d3697786564ef002 (patch)
tree9d6e3eb9d9e8ecc419bab7480f759a2e6be52802
parent7a472e0da964d9157bb25e90a4717093498f3f7d (diff)
downloadffmpeg-d5b068d44b4bf42951611a92d3697786564ef002.tar.gz
swresample/x86/audio_convert: add emms to CONV
Fixes ticket #1874 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)
-rw-r--r--libswresample/x86/audio_convert.asm5
1 files changed, 5 insertions, 0 deletions
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index 6fc86f0748..d5563a2461 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
@@ -196,7 +196,12 @@ cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
add lenq, 2*mmsize/(1<<%4)
%endif
jl .next
+%if mmsize == 8
+ emms
+ RET
+%else
REP_RET
+%endif
%endmacro
%macro PACK_6CH 5-7