diff options
| author | James Zern <jzern@google.com> | 2014-05-20 15:24:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-20 15:24:20 -0700 |
| commit | 80acef01d46f5aae10416435a53948d8aef24f95 (patch) | |
| tree | 55f1d898e89467e477f7fb34af1cc9e3990d2798 /vpx | |
| parent | 606604109b126549f52904856ffaeff1807e241b (diff) | |
| parent | f12ebfc939b61f49059a2e60505a036a17d0561b (diff) | |
| download | libvpx-80acef01d46f5aae10416435a53948d8aef24f95.tar.gz libvpx-80acef01d46f5aae10416435a53948d8aef24f95.tar.bz2 libvpx-80acef01d46f5aae10416435a53948d8aef24f95.zip | |
Merge "make spatial svc an experiment"
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/vpx_codec.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk index 98d1d567c..a1ad3c531 100644 --- a/vpx/vpx_codec.mk +++ b/vpx/vpx_codec.mk @@ -15,8 +15,10 @@ API_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h API_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h -API_SRCS-$(CONFIG_VP9_ENCODER) += src/svc_encodeframe.c -API_SRCS-$(CONFIG_VP9_ENCODER) += svc_context.h +ifeq ($(CONFIG_VP9_ENCODER),yes) + API_SRCS-$(CONFIG_SPATIAL_SVC) += src/svc_encodeframe.c + API_SRCS-$(CONFIG_SPATIAL_SVC) += svc_context.h +endif API_SRCS-$(CONFIG_VP8_DECODER) += vp8.h API_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h |