From: Yue Chen Date: Thu, 29 Sep 2016 19:12:47 +0000 (-0700) Subject: Fix compiler error for GLOBAL_MOTION+WARPED_MOTION X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=235133a22e9f66e9310ccdfa887cb7f89b56e0d7;p=libvpx Fix compiler error for GLOBAL_MOTION+WARPED_MOTION Fix the logical OR computation in .mk file. Otherwise, when both experiments are on, the output of $(filter... will be two 'yes', which will cause missing library issue. Change-Id: I53c44e925dc9ea77c7467217c20e4f1bc7e20fc3 --- diff --git a/av1/av1_common.mk b/av1/av1_common.mk index 9976e7aab..26ef9c5f9 100644 --- a/av1/av1_common.mk +++ b/av1/av1_common.mk @@ -82,7 +82,7 @@ AV1_COMMON_SRCS-yes += common/av1_convolve.c AV1_COMMON_SRCS-yes += common/av1_convolve.h AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.h AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.c -ifeq (yes,$(filter yes,$(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION))) +ifeq (yes,$(filter $(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION),yes)) AV1_COMMON_SRCS-yes += common/warped_motion.h AV1_COMMON_SRCS-yes += common/warped_motion.c endif