[FFmpeg-cvslog] libswresample: cosmetics
Michael Niedermayer
git at videolan.org
Sun May 13 19:33:09 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 13 19:24:34 2012 +0200| [b3915c4b70c094b8cee5b5ccee9dfce3232e887d] | committer: Michael Niedermayer
libswresample: cosmetics
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3915c4b70c094b8cee5b5ccee9dfce3232e887d
---
libswresample/x86/audio_convert.asm | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index cbff72c..87ae4b3 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
@@ -283,19 +283,6 @@ pack_6ch_%2_to_%1_u_int %+ SUFFIX
%endif
%endmacro
-INIT_MMX mmx
-CONV_FLTP_TO_FLT_6CH float,float,u
-CONV_FLTP_TO_FLT_6CH float,float,a
-INIT_XMM sse4
-CONV_FLTP_TO_FLT_6CH float,float,u
-CONV_FLTP_TO_FLT_6CH float,float,a
-%if HAVE_AVX
-INIT_XMM avx
-CONV_FLTP_TO_FLT_6CH float,float,u
-CONV_FLTP_TO_FLT_6CH float,float,a
-%endif
-
-
%macro INT16_TO_INT32_N 0
pxor m2, m2
pxor m3, m3
@@ -379,6 +366,9 @@ CONV int32, int16, a, 2, 1, INT16_TO_INT32_N
CONV int16, int32, u, 1, 2, INT32_TO_INT16_N
CONV int16, int32, a, 1, 2, INT32_TO_INT16_N
+CONV_FLTP_TO_FLT_6CH float,float,u
+CONV_FLTP_TO_FLT_6CH float,float,a
+
INIT_XMM sse
CONV int32, int16, u, 2, 1, INT16_TO_INT32_N
CONV int32, int16, a, 2, 1, INT16_TO_INT32_N
@@ -440,7 +430,15 @@ UNPACK_2CH int32, int16, a, 2, 1, INT16_TO_INT32_N
UNPACK_2CH float, int16, u, 2, 1, INT16_TO_FLOAT_N, INT16_TO_FLOAT_INIT
UNPACK_2CH float, int16, a, 2, 1, INT16_TO_FLOAT_N, INT16_TO_FLOAT_INIT
+INIT_XMM sse4
+CONV_FLTP_TO_FLT_6CH float,float,u
+CONV_FLTP_TO_FLT_6CH float,float,a
+
%if HAVE_AVX
+INIT_XMM avx
+CONV_FLTP_TO_FLT_6CH float,float,u
+CONV_FLTP_TO_FLT_6CH float,float,a
+
INIT_YMM avx
CONV float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT
CONV float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT
More information about the ffmpeg-cvslog
mailing list