summaryrefslogtreecommitdiff
path: root/vp8/vp8_common.mk
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2013-03-27 12:29:32 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-03-27 12:29:32 -0700
commit103207ba8f0f422214f7433e13fc3c58cdffa5ce (patch)
tree70f97e3c49a6da477532208185a0726a6fa239dc /vp8/vp8_common.mk
parent28d9202ed4d8af3eb128fa9192e6e3c4b1c9f67d (diff)
parent771fc832f3889c067b76899c8209bd0854ba7f7d (diff)
downloadlibvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar
libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar.gz
libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar.bz2
libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.zip
Merge "Merge branch 'master' into experimental" into experimental
Diffstat (limited to 'vp8/vp8_common.mk')
-rw-r--r--vp8/vp8_common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk
index 2f73420a5..cde2651b5 100644
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -14,7 +14,6 @@ VP8_COMMON_SRCS-yes += common/ppflags.h
VP8_COMMON_SRCS-yes += common/onyx.h
VP8_COMMON_SRCS-yes += common/onyxd.h
VP8_COMMON_SRCS-yes += common/alloccommon.c
-VP8_COMMON_SRCS-yes += common/asm_com_offsets.c
VP8_COMMON_SRCS-yes += common/blockd.c
VP8_COMMON_SRCS-yes += common/coefupdateprobs.h
VP8_COMMON_SRCS-yes += common/debugmodes.c
@@ -67,6 +66,7 @@ VP8_COMMON_SRCS-yes += common/setupintrarecon.c
VP8_COMMON_SRCS-yes += common/swapyv12buffer.c
VP8_COMMON_SRCS-yes += common/variance_c.c
VP8_COMMON_SRCS-yes += common/variance.h
+VP8_COMMON_SRCS-yes += common/vp8_asm_com_offsets.c
VP8_COMMON_SRCS-yes += common/vp8_entropymodedata.h
@@ -193,6 +193,6 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16_neon$
VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM)
$(eval $(call asm_offsets_template,\
- vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/asm_com_offsets.c))
+ vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/vp8_asm_com_offsets.c))
$(eval $(call rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh))