From: Johann <johannkoenig@google.com>
Date: Mon, 14 Mar 2011 19:47:42 +0000 (-0700)
Subject: Merge "Add vp8_mse16x16_armv6 function"
X-Git-Tag: v0.9.7~270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0ec28b3d3e62709a5471bd7f0fbdc1e17b28f87;p=libvpx

Merge "Add vp8_mse16x16_armv6 function"
---

d0ec28b3d3e62709a5471bd7f0fbdc1e17b28f87
diff --cc vp8/vp8cx_arm.mk
index f8979f4f7,429898a61..b07ee8ffb
--- a/vp8/vp8cx_arm.mk
+++ b/vp8/vp8cx_arm.mk
@@@ -34,9 -34,9 +34,10 @@@ VP8_CX_SRCS-$(HAVE_ARMV5TE)  += encoder
  
  #File list for armv6
  # encoder
 +VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM)
+ VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/walsh_v6$(ASM)
  
  #File list for neon