ref: b9f23561823eb0745d07064c7e8dcd254686e2d3
parent: b8a78cfa49d27a1f71e77430ff10d833446fe496
parent: 4be062bbc3466cfd542a7485f5a2a8eadac4f24e
author: John Koleszar <jkoleszar@google.com>
date: Mon Mar 28 20:05:07 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: Iae24496ca5ceb4446211c1e27351434c16b09dd1
--- 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
--
⑨