Commit 12231bd6 authored by Hui Su's avatar Hui Su
Browse files

Fix build when motion-var is disabled

Change-Id: Ie3912cb012676ccd26d2c0601e21fbb54943b1a0
parent 2357382a
...@@ -1573,18 +1573,15 @@ static INLINE MOTION_MODE motion_mode_allowed( ...@@ -1573,18 +1573,15 @@ static INLINE MOTION_MODE motion_mode_allowed(
if (!has_second_ref(mbmi) && mbmi->num_proj_ref[0] >= 1 && if (!has_second_ref(mbmi) && mbmi->num_proj_ref[0] >= 1 &&
!av1_is_scaled(&(xd->block_refs[0]->sf))) { !av1_is_scaled(&(xd->block_refs[0]->sf))) {
return WARPED_CAUSAL; return WARPED_CAUSAL;
} else { }
#endif // CONFIG_WARPED_MOTION #endif // CONFIG_WARPED_MOTION
#if CONFIG_MOTION_VAR #if CONFIG_MOTION_VAR
#if CONFIG_NCOBMC_ADAPT_WEIGHT #if CONFIG_NCOBMC_ADAPT_WEIGHT
if (ncobmc_mode_allowed_bsize(mbmi->sb_type) < NO_OVERLAP) if (ncobmc_mode_allowed_bsize(mbmi->sb_type) < NO_OVERLAP)
return NCOBMC_ADAPT_WEIGHT; return NCOBMC_ADAPT_WEIGHT;
else else
#endif #endif
return OBMC_CAUSAL; return OBMC_CAUSAL;
#if CONFIG_WARPED_MOTION
}
#endif // CONFIG_WARPED_MOTION
#else #else
return SIMPLE_TRANSLATION; return SIMPLE_TRANSLATION;
#endif // CONFIG_MOTION_VAR #endif // CONFIG_MOTION_VAR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment