diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:52:54 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:53:02 -0400 |
| commit | ba83622a00b982297f71dccb25ecb9a8047afa4e (patch) | |
| tree | e21963481583fce9c1363ff8116f58ce7e2c90e5 /vp8/vp8cx_arm.mk | |
| parent | 601781138241d506bed2c4cdb285a51714dce380 (diff) | |
| parent | 3788b3564c587983a10d7131b35c0d9c39540666 (diff) | |
| download | libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.gz libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.bz2 libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/encoder/onyx_if.c
Change-Id: Ieef9a58a2effdc68cf52bc5f14d90c31a1dbc13a
Diffstat (limited to 'vp8/vp8cx_arm.mk')
| -rw-r--r-- | vp8/vp8cx_arm.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 7980a0f75..f8979f4f7 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -34,6 +34,7 @@ VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_ar #File list for armv6 # encoder +VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM) |