]> granicus.if.org Git - libvpx/commitdiff
Fix compiler error for GLOBAL_MOTION+WARPED_MOTION
authorYue Chen <yuec@google.com>
Thu, 29 Sep 2016 19:12:47 +0000 (12:12 -0700)
committerYue Chen <yuec@google.com>
Thu, 29 Sep 2016 19:12:47 +0000 (12:12 -0700)
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

av1/av1_common.mk

index 9976e7aab3bb0e5a74ee804b22a245a8698f1145..26ef9c5f9a4b423c7acaca6603088a6f69711eee 100644 (file)
@@ -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