From: Clément Bœsch Date: Thu, 23 Mar 2017 10:54:53 +0000 (+0100) Subject: Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c' X-Git-Tag: n3.3~419 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=9954d5b44eec41a2ebcbc61f67ce719184c0ec57 Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c' * commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c': hevc: x86: Refactor IDCT macro declarations Merged-by: Clément Bœsch --- 9954d5b44eec41a2ebcbc61f67ce719184c0ec57 diff --cc libavcodec/x86/hevc_idct.asm index 33b437c257,71e4607dd7..26649d0d88 --- a/libavcodec/x86/hevc_idct.asm +++ b/libavcodec/x86/hevc_idct.asm @@@ -86,38 -86,10 +86,11 @@@ IDCT_DC 32, 16, % %if HAVE_AVX2_EXTERNAL INIT_YMM avx2 - IDCT_DC 16, 2, 8 - IDCT_DC 32, 8, 8 + IDCT_DC 16, 2, %1 + IDCT_DC 32, 8, %1 %endif ;HAVE_AVX2_EXTERNAL + %endmacro - ; 10-bit - INIT_MMX mmxext - IDCT_DC_NL 4, 10 - IDCT_DC 8, 2, 10 - - INIT_XMM sse2 - IDCT_DC_NL 8, 10 - IDCT_DC 16, 4, 10 - IDCT_DC 32, 16, 10 - - %if HAVE_AVX2_EXTERNAL - INIT_YMM avx2 - IDCT_DC 16, 2, 10 - IDCT_DC 32, 8, 10 - %endif ;HAVE_AVX2_EXTERNAL - - ; 12-bit - INIT_MMX mmxext - IDCT_DC_NL 4, 12 - IDCT_DC 8, 2, 12 - - INIT_XMM sse2 - IDCT_DC_NL 8, 12 - IDCT_DC 16, 4, 12 - IDCT_DC 32, 16, 12 - - %if HAVE_AVX2_EXTERNAL - INIT_YMM avx2 - IDCT_DC 16, 2, 12 - IDCT_DC 32, 8, 12 - %endif ;HAVE_AVX2_EXTERNAL + INIT_IDCT_DC 8 + INIT_IDCT_DC 10 ++INIT_IDCT_DC 12