Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'

[ffmpeg] / libavcodec / x86 / vp9mc_16bpp.asm

diff --git a/libavcodec/x86/vp9mc_16bpp.asm b/libavcodec/x86/vp9mc_16bpp.asm
index 52fc5eee6dfdd313a775e8805e1f58e594fe9237..f60dab7a634a67236a20d187ced45ceba12b8d24 100644 (file)
--- a/libavcodec/x86/vp9mc_16bpp.asm
+++ b/libavcodec/x86/vp9mc_16bpp.asm
@@ -201,6 +201,11 @@ cglobal vp9_%1_8tap_1d_h_ %+ %%px %+ _12, 6, 6, %2, dst, dstride, src, sstride,
 INIT_XMM sse2
 filter_h_fn put
 filter_h_fn avg
+%if HAVE_AVX2_EXTERNAL
+INIT_YMM avx2
+filter_h_fn put
+filter_h_fn avg
+%endif
 
 %macro filter_v4_fn 1-2 12
 %if ARCH_X86_64
@@ -419,3 +424,8 @@ cglobal vp9_%1_8tap_1d_v_ %+ %%px %+ _12, 4, 7, %2, dst, dstride, src, sstride,
 INIT_XMM sse2
 filter_v_fn put
 filter_v_fn avg
+%if HAVE_AVX2_EXTERNAL
+INIT_YMM avx2
+filter_v_fn put
+filter_v_fn avg
+%endif