ref: 0e00dbae0273d501bf01a48b246c2c5baf1f7f18
parent: 3db785facc52dcd14f41c7a46a17bbfbcd161716
parent: 0e8cc9a82fcc49ee466f827e19139fb5e644404d
author: James Zern <[email protected]>
date: Fri Dec 5 15:36:44 EST 2014
Merge "fix building with --disable-spatial-resampling"
--- a/vpx_scale/vpx_scale.mk
+++ b/vpx_scale/vpx_scale.mk
@@ -1,7 +1,7 @@
SCALE_SRCS-yes += vpx_scale.mk
SCALE_SRCS-yes += yv12config.h
-SCALE_SRCS-yes += vpx_scale.h
-SCALE_SRCS-yes += generic/vpx_scale.c
+SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += vpx_scale.h
+SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/vpx_scale.c
SCALE_SRCS-yes += generic/yv12config.c
SCALE_SRCS-yes += generic/yv12extend.c
SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c