diff options
| author | James Zern <jzern@google.com> | 2014-12-05 20:36:44 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-05 20:36:44 -0800 |
| commit | 0e00dbae0273d501bf01a48b246c2c5baf1f7f18 (patch) | |
| tree | 1412e2207b136d21273d53ce0b1b4a357098b9c8 | |
| parent | 3db785facc52dcd14f41c7a46a17bbfbcd161716 (diff) | |
| parent | 0e8cc9a82fcc49ee466f827e19139fb5e644404d (diff) | |
| download | libvpx-0e00dbae0273d501bf01a48b246c2c5baf1f7f18.tar libvpx-0e00dbae0273d501bf01a48b246c2c5baf1f7f18.tar.gz libvpx-0e00dbae0273d501bf01a48b246c2c5baf1f7f18.tar.bz2 libvpx-0e00dbae0273d501bf01a48b246c2c5baf1f7f18.zip | |
Merge "fix building with --disable-spatial-resampling"
| -rw-r--r-- | vpx_scale/vpx_scale.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index 92d499175..a49abf3b4 100644 --- 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 |