commit 0bdea0d894fdd2aa163938e80a2d6587719fa427
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Oct 02 15:15:05 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Oct 02 15:15:05 2017 +0200
tree 4011ecb7e953ff414ddcad84c78dd2877b96cef1
parent 355a7a717fca05b787d5f5425c916520bc1cbcf6

Remove compile guards for CONFIG_EXT_INTER

This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: Ic077963f72e8cc2ae9872b58c8a0241988384110

aom_dsp/variance.c

diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index 18dea65..3c99aa1 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -773,7 +773,7 @@
 }
 #endif  // CONFIG_HIGHBITDEPTH
 
-#if CONFIG_AV1 && CONFIG_EXT_INTER
+#if CONFIG_AV1
 void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width,
                           int height, const uint8_t *ref, int ref_stride,
                           const uint8_t *mask, int mask_stride,
@@ -1011,7 +1011,7 @@
 #endif  // CONFIG_EXT_PARTITION
 #endif  // CONFIG_EXT_PARTITION_TYPES
 #endif  // CONFIG_HIGHBITDEPTH
-#endif  // CONFIG_AV1 && CONFIG_EXT_INTER
+#endif  // CONFIG_AV1
 
 #if CONFIG_AV1 && CONFIG_MOTION_VAR
 static INLINE void obmc_variance(const uint8_t *pre, int pre_stride,