Merge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'

* commit 'e4128c08d786eb5513578e8c6063671ba03226ab':
  Revert "hevc: x86: Refactor IDCT macro declarations"

So apparently this was technically correct be reverted due to
authorship. Reverted as well in FFmpeg for now...

See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.html

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/x86/hevc_idct.asm
index 26649d0d88395b06e142f1bc08051af25b1b8e32,d662aa90ba71fca4d91983ff7e6acc6237766520..33b437c2575cf34ba63f11fe59f3a4202e2dd3cb
--- 1/libavcodec/x86/hevc_idct.asm
--- 2/libavcodec/x86/hevc_idct.asm
+++ b/libavcodec/x86/hevc_idct.asm
@@@ -86,11 -86,22 +86,38 @@@ IDCT_DC    32, 16,  
  
  %if HAVE_AVX2_EXTERNAL
  INIT_YMM avx2
- IDCT_DC    16,  2,  %1
- IDCT_DC    32,  8,  %1
+ IDCT_DC    16,  2,  8
+ IDCT_DC    32,  8,  8
  %endif ;HAVE_AVX2_EXTERNAL
- %endmacro
  
- INIT_IDCT_DC  8
- INIT_IDCT_DC 10
- INIT_IDCT_DC 12
+ ; 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