From: Yunqing Wang <yunqingwang@google.com>
Date: Thu, 15 May 2014 18:29:29 +0000 (-0700)
Subject: Merge "AVX2 To VP9 Block Error Optimization"
X-Git-Tag: v1.4.0~1575
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c661cf0dad163e16d4a960ae4978a2fc1bee95c0;p=libvpx

Merge "AVX2 To VP9 Block Error Optimization"
---

c661cf0dad163e16d4a960ae4978a2fc1bee95c0
diff --cc vp9/vp9cx.mk
index bc9a478bc,6acd44ca8..6e5c521ab
--- a/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