Merge "Make implicit_segmentation-related code an experiment." into experimental

10afa9e2 · Paul Wilkins · Gerrit Code Review · edd66a99 · 81666571 · 10afa9e2
Commit 10afa9e2 authored Oct 30, 2012 by Paul Wilkins Committed by Gerrit Code Review Oct 30, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

configure configure +1 -0

vp8/vp8_common.mk vp8/vp8_common.mk +1 -1

No files found.
--- a/configure
+++ b/configure
@@ -224,6 +224,7 @@ EXPERIMENT_LIST="
    switchable_interp
    newbestrefmv
    new_mvref
+    implicit_segmentation
 "
 CONFIG_LIST="
    external_build

--- 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