diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:27:52 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:27:52 -0400 |
| commit | 51bcf621c174a5970a0f455572e3e3cf28cab5dd (patch) | |
| tree | 356d9b44265a40db88fa62064115095dca5014e9 /vp8/vp8_common.mk | |
| parent | 9f0082296817b7fe5101d3fca1e67b2524b41a73 (diff) | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b (diff) | |
| download | libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar.gz libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.tar.bz2 libvpx-51bcf621c174a5970a0f455572e3e3cf28cab5dd.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/decoder/decodemv.c
vp8/decoder/onyxd_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
Change-Id: Ia1c1c5e589f4200822d12378c7749ba62bd17ae2
Diffstat (limited to 'vp8/vp8_common.mk')
| -rw-r--r-- | vp8/vp8_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index b2f53a4a4..54a7eacab 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -69,7 +69,7 @@ VP8_COMMON_SRCS-yes += common/reconintra.c VP8_COMMON_SRCS-yes += common/reconintra4x4.c VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c -VP8_COMMON_SRCS-yes += common/textblit.c +VP8_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c VP8_COMMON_SRCS-yes += common/treecoder.c VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h |