[FFmpeg-cvslog] libswresample-simd: rename 6ch pack to what it is

Michael Niedermayer git at videolan.org
Sun May 13 21:21:32 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 13 20:31:12 2012 +0200| [ecfdd125f17f53d3d05ad9eaec06af5c52ab1db3] | committer: Michael Niedermayer

libswresample-simd: rename 6ch pack to what it is

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecfdd125f17f53d3d05ad9eaec06af5c52ab1db3
---

 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 6bbffd2..fcf7ac1 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



More information about the ffmpeg-cvslog mailing list