commit bb8eebc0e09969881968fcc411e5a00d2ec6e6fa
author Yaowu Xu <yaowu@google.com> Tue Feb 09 16:57:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 09 16:57:28 2016 +0000
tree abc02522e6edebb7583cc2c4eb5000d0fb84952b
parent 29e211886f2e2abfd88bb6fb3e82cb471847e93d
parent 5c327cb4506233c422c719f5a5e8c03d1f064b79

Merge "Set use_highbitdepth flag to either 1 or 0"

vp9/vp9cx.mk

diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 83a91e8..2930c23 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -119,7 +119,9 @@
 
 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