From: Johann <johannkoenig@google.com>
Date: Thu, 15 Aug 2013 21:55:15 +0000 (-0700)
Subject: Merge "vp9: neon: add vp9_convolve_avg_neon"
X-Git-Tag: v1.3.0~598
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9aa7d07d067e2805146253c1997c0f9d49ae6f0;p=libvpx

Merge "vp9: neon: add vp9_convolve_avg_neon"
---

a9aa7d07d067e2805146253c1997c0f9d49ae6f0
diff --cc vp9/vp9_common.mk
index d6c70dc3c,e4bf4f4e1..c6f398101
--- a/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@@ -98,8 -97,8 +98,9 @@@ VP9_COMMON_SRCS-$(HAVE_NEON) += common/
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_dc_only_idct_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct4x4_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct8x8_add_neon$(ASM)
 +VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct16x16_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_mb_lpf_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_copy_neon$(ASM)
+ VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_avg_neon$(ASM)
  
  $(eval $(call rtcd_h_template,vp9_rtcd,vp9/common/vp9_rtcd_defs.sh))