ref: 057ace0d9241aa3cca5b613cedba75661ce666ab
parent: d66da5bcd7ad0bdef883c06da4735da60e483d98
parent: 4be062bbc3466cfd542a7485f5a2a8eadac4f24e
author: John Koleszar <jkoleszar@google.com>
date: Mon Mar 28 20:05:04 EDT 2011
Merge remote branch 'internal/upstream' into HEAD
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -33,6 +33,7 @@
#INCLUDES += common
#INCLUDES += encoder
+VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c
VP8_CX_SRCS-yes += encoder/bitstream.c
VP8_CX_SRCS-yes += encoder/boolhuff.c
VP8_CX_SRCS-yes += encoder/dct.c
--- a/vp8/vp8cx_arm.mk
+++ b/vp8/vp8cx_arm.mk
@@ -14,7 +14,6 @@
#File list for arm
# encoder
VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/asm_enc_offsets.c
VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/encodemb_arm.c
VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/quantize_arm.c