diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 20:31:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 20:31:12 +0200 |
| commit | ecfdd125f17f53d3d05ad9eaec06af5c52ab1db3 (patch) | |
| tree | 4f77a4433e36e281cac4ed9042567898948021e8 | |
| parent | 429b964e25f8a67a052036f79d1bdaab974cd7b4 (diff) | |
| download | ffmpeg-ecfdd125f17f53d3d05ad9eaec06af5c52ab1db3.tar.gz | |
libswresample-simd: rename 6ch pack to what it is
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/x86/audio_convert.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index 6bbffd248c..fcf7ac108a 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -199,7 +199,7 @@ cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len REP_RET %endmacro -%macro CONV_FLTP_TO_FLT_6CH 3 +%macro PACK_6CH 3 cglobal pack_6ch_%2_to_%1_%3, 2,8,7, dst, src, src1, src2, src3, src4, src5, len %if ARCH_X86_64 mov lend, r2d @@ -369,8 +369,8 @@ CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N -CONV_FLTP_TO_FLT_6CH float,float,u -CONV_FLTP_TO_FLT_6CH float,float,a +PACK_6CH float,float,u +PACK_6CH float,float,a INIT_XMM sse CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N @@ -434,13 +434,13 @@ 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 +PACK_6CH float,float,u +PACK_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 +PACK_6CH float,float,u +PACK_6CH float,float,a INIT_YMM avx CONV float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT |