summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2016-02-09 14:52:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-02-09 14:52:04 +0000
commit29e211886f2e2abfd88bb6fb3e82cb471847e93d (patch)
tree74e5446eb635f571f020d81fda397276e89233d0 /vp9
parentf28ea3e830a2447bc9a3813c302f36594d1376d3 (diff)
parent0840c6fb8fd5e59cd5de0fb99b6d19b664a758eb (diff)
downloadlibvpx-29e211886f2e2abfd88bb6fb3e82cb471847e93d.tar
libvpx-29e211886f2e2abfd88bb6fb3e82cb471847e93d.tar.gz
libvpx-29e211886f2e2abfd88bb6fb3e82cb471847e93d.tar.bz2
libvpx-29e211886f2e2abfd88bb6fb3e82cb471847e93d.zip
Merge "BUG FIX: undefined reference to `vp9_scale_and_extend_frame_c'"
Diffstat (limited to 'vp9')
-rw-r--r--vp9/vp9cx.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 83a91e870..2930c23dd 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -119,7 +119,9 @@ endif
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
+ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_frame_scale_ssse3.c
+endif
ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_denoiser_sse2.c