diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-10-30 08:18:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-30 08:18:10 -0700 |
| commit | 10afa9e2295f56faa6696bd8c48d99510bbaec0d (patch) | |
| tree | b99744bf006fad4b6363d18d3def68c08d37b100 /vp8 | |
| parent | edd66a996c0a2fa28fc0eee14d8a715db4945bff (diff) | |
| parent | 8166657109215a34c0bfb58407258aa18961ea64 (diff) | |
| download | libvpx-10afa9e2295f56faa6696bd8c48d99510bbaec0d.tar libvpx-10afa9e2295f56faa6696bd8c48d99510bbaec0d.tar.gz libvpx-10afa9e2295f56faa6696bd8c48d99510bbaec0d.tar.bz2 libvpx-10afa9e2295f56faa6696bd8c48d99510bbaec0d.zip | |
Merge "Make implicit_segmentation-related code an experiment." into experimental
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/vp8_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index c2eeff1b3..ed1923aa5 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -78,7 +78,7 @@ VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c VP8_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c VP8_COMMON_SRCS-yes += common/treecoder.c -VP8_COMMON_SRCS-yes += common/implicit_segmentation.c +VP8_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/implicit_segmentation.c VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h |