Merge "AVX2 To VP9 Block Error Optimization"

diff --cc vp9/common/vp9_rtcd_defs.pl
Simple merge

diff --cc vp9/vp9cx.mk
index bc9a478,6acd44c..6e5c521
--- 1/vp9/vp9cx.mk
--- 2/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@@ -101,8 -102,8 +101,9 @@@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86
  VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm
  
  ifeq ($(CONFIG_USE_X86INC),yes)
 +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm
+ VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_error_intrin_avx2.c
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c