From: John Koleszar <jkoleszar@google.com>
Date: Wed, 9 Feb 2011 13:34:48 +0000 (-0500)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~387
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2ad177942d4b75dea000ca86e86231cfec55c82;p=libvpx

Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	vp8/vp8_common.mk

Change-Id: I2094ddf20834c0b7dfe912feac6a79500bb8cce2
---

b2ad177942d4b75dea000ca86e86231cfec55c82
diff --cc vp8/vp8_common.mk
index b84925fbc,c1b87d472..270006ed8
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@@ -111,11 -111,7 +111,12 @@@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x
  VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
  endif
  
+ VP8_COMMON_SRCS-$(ARCH_ARM)  += common/asm_com_offsets.c
 +ifeq ($(CONFIG_CSM),yes)
 +VP8_COMMON_SRCS-yes += common/maskingmv.c
 +VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm
 +endif
 +
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/arm_systemdependent.c
  
  # common (c)