From bcf4e0aba822d24e9fee7e632639afa844c5f4e9 Mon Sep 17 00:00:00 2001
From: Debargha Mukherjee <debargha@google.com>
Date: Thu, 9 Jun 2016 02:22:48 -0700
Subject: [PATCH] Add warped motion config flag

Change-Id: I4b5e1251dc215073384e168a6f845ae059d6c4f2
---
 configure           | 1 +
 vp10/vp10_common.mk | 4 ++++
 vp10/vp10cx.mk      | 2 --
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 26203692c..ced8cb283 100755
--- a/configure
+++ b/configure
@@ -288,6 +288,7 @@ EXPERIMENT_LIST="
     ext_partition_types
     ext_tile
     obmc
+    warped_motion
     entropy
     bidir_pred
 "
diff --git a/vp10/vp10_common.mk b/vp10/vp10_common.mk
index 650b6f3bc..9bc0ce074 100644
--- a/vp10/vp10_common.mk
+++ b/vp10/vp10_common.mk
@@ -88,6 +88,10 @@ ifeq ($(CONFIG_VP9_POSTPROC),yes)
 VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mfqe_sse2.asm
 VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
 endif
+ifeq (yes,$(filter yes,$(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION)))
+VP10_COMMON_SRCS-yes += common/warped_motion.h
+VP10_COMMON_SRCS-yes += common/warped_motion.c
+endif
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
 VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans4_dspr2.c
diff --git a/vp10/vp10cx.mk b/vp10/vp10cx.mk
index ea537fefa..007fb4e2a 100644
--- a/vp10/vp10cx.mk
+++ b/vp10/vp10cx.mk
@@ -96,8 +96,6 @@ VP10_CX_SRCS-yes += encoder/temporal_filter.c
 VP10_CX_SRCS-yes += encoder/temporal_filter.h
 VP10_CX_SRCS-yes += encoder/mbgraph.c
 VP10_CX_SRCS-yes += encoder/mbgraph.h
-VP10_CX_SRCS-$(CONFIG_GLOBAL_MOTION) += common/warped_motion.h
-VP10_CX_SRCS-$(CONFIG_GLOBAL_MOTION) += common/warped_motion.c
 
 VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
 VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
-- 
2.49.0