diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-11-06 16:59:01 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-11-07 11:30:16 -0800 |
| commit | 7b8dfcb5a2cfb01ee7a6009d945d06559b564d06 (patch) | |
| tree | 29365387746cff257aede84bf84525435b3d948b /vp9/vp9_common.mk | |
| parent | 82b1a3433df1705e73d83eaeb9731f67c29c8883 (diff) | |
| parent | 3c8007f19ecd612a9e3c462b83f7ab740546f8f9 (diff) | |
| download | libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.gz libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.bz2 libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.zip | |
Rough merge of master into experimental
Creates a merge between the master and experimental branches. Fixes a
number of conflicts in the build system to allow *either* VP8 or VP9
to be built. Specifically either:
$ configure --disable-vp9 $ configure --disable-vp8
--disable-unit-tests
VP9 still exports its symbols and files as VP8, so that will be
resolved in the next commit.
Unit tests are broken in VP9, but this isn't a new issue. They are
fixed upstream on origin/experimental as of this writing, but rebasing
this merge proved difficult, so will tackle that in a second merge
commit.
Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
Diffstat (limited to 'vp9/vp9_common.mk')
| -rw-r--r-- | vp9/vp9_common.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index c5237d846..82e1e1053 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -177,3 +177,7 @@ VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon16x16mb_neon$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/buildintrapredictorsmby_neon$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/save_neon_reg$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c + + +$(eval $(call asm_offsets_template,\ + vp9_asm_com_offsets.asm, $(VP9_PREFIX)common/asm_com_offsets.c)) |