From 46ef45ab59e416fae92d9fd27f050268eb2a495a Mon Sep 17 00:00:00 2001 From: James Darnley Date: Fri, 5 Sep 2014 00:13:35 +0200 Subject: [PATCH] lavc/x86/v210: give cpuflag to INIT macro This lets the cglobal macro automatically append a suffix to the function name. This means that INIT_XMM avx must be used rather than INIT_AVX. Signed-off-by: Michael Niedermayer --- libavcodec/x86/v210.asm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavcodec/x86/v210.asm b/libavcodec/x86/v210.asm index 6554a43de1..400a1f3f9e 100644 --- a/libavcodec/x86/v210.asm +++ b/libavcodec/x86/v210.asm @@ -31,10 +31,10 @@ v210_chroma_shuf: db 0,1,8,9,6,7,-1,-1,2,3,4,5,12,13,-1,-1 SECTION .text -%macro v210_planar_unpack 2 +%macro v210_planar_unpack 1 ; v210_planar_unpack(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width) -cglobal v210_planar_unpack_%1_%2, 5, 5, 7 +cglobal v210_planar_unpack_%1, 5, 5, 7 movsxdifnidn r4, r4d lea r1, [r1+2*r4] add r2, r4 @@ -73,16 +73,18 @@ cglobal v210_planar_unpack_%1_%2, 5, 5, 7 REP_RET %endmacro -INIT_XMM -v210_planar_unpack unaligned, ssse3 +INIT_XMM ssse3 +v210_planar_unpack unaligned + %if HAVE_AVX_EXTERNAL -INIT_AVX -v210_planar_unpack unaligned, avx +INIT_XMM avx +v210_planar_unpack unaligned %endif -INIT_XMM -v210_planar_unpack aligned, ssse3 +INIT_XMM ssse3 +v210_planar_unpack aligned + %if HAVE_AVX_EXTERNAL -INIT_AVX -v210_planar_unpack aligned, avx +INIT_XMM avx +v210_planar_unpack aligned %endif