From 64a2fb87c1c481ee29163a515e03c3f563f0a390 Mon Sep 17 00:00:00 2001 From: Angie Chiang Date: Thu, 6 Jul 2017 10:15:16 -0700 Subject: [PATCH] Fix compiler bug of interintra exp Change-Id: I599b57141d58b62a56bf884d7d50d1b6ebfd8b67 --- av1/encoder/rdopt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index e04724765..12b04c857 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c @@ -2209,7 +2209,8 @@ static int skip_txfm_search(const AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs, return 0; } -#if CONFIG_EXT_INTER && (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT) +#if CONFIG_EXT_INTER && \ + (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA) static int64_t estimate_yrd_for_sb(const AV1_COMP *const cpi, BLOCK_SIZE bs, MACROBLOCK *x, int *r, int64_t *d, int *s, int64_t *sse, int64_t ref_best_rd) { @@ -8239,7 +8240,7 @@ static int64_t handle_inter_mode(const AV1_COMP *const cpi, MACROBLOCK *x, int rate_mv = 0; #if CONFIG_EXT_INTER int pred_exists = 1; -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT +#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA const int bw = block_size_wide[bsize]; #endif // ONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT int_mv single_newmv[TOTAL_REFS_PER_FRAME]; -- GitLab