Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'

* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
  v210: x86: Add the correct guards around the asm code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/x86/v210enc.asm
index 0545454c472dc6dff85f1c20b17a2ea423c76b76,bdefcdbfa12b6b61282db940ab30a52ee29ba25d..965f2bea3c317a41503d3d6190d54f3f4a21b804
--- 1/libavcodec/x86/v210enc.asm
--- 2/libavcodec/x86/v210enc.asm
+++ b/libavcodec/x86/v210enc.asm
@@@ -93,14 -82,11 +93,16 @@@ cglobal v210_planar_pack_10, 5, 5, 4+cp
      RET
  %endmacro
  
+ %if HAVE_SSSE3_EXTERNAL
  INIT_XMM ssse3
  v210_planar_pack_10
+ %endif
  
 +%if HAVE_AVX2_EXTERNAL
 +INIT_YMM avx2
 +v210_planar_pack_10
 +%endif
 +
  %macro v210_planar_pack_8 0
  
  ; v210_planar_pack_8(const uint8_t *y, const uint8_t *u, const uint8_t *v, uint8_t *dst, ptrdiff_t width)
@@@ -167,12 -141,11 +169,16 @@@ cglobal v210_planar_pack_8, 5, 5, 7, y
      RET
  %endmacro
  
+ %if HAVE_SSSE3_EXTERNAL
  INIT_XMM ssse3
  v210_planar_pack_8
+ %endif
+ %if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  v210_planar_pack_8
+ %endif
 +
 +%if HAVE_AVX2_EXTERNAL
 +INIT_YMM avx2
 +v210_planar_pack_8
 +%endif