Commit 0bae6244 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Fix build failures with global-motion w/o ref-mv

BUG=aomedia:486

Change-Id: I878e8b280e99a107643da76c5f21ac7aa69d37ec
parent f2e7b938
......@@ -869,13 +869,15 @@ void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
find_mv_refs_sync sync, void *const data,
int16_t *mode_context) {
int_mv zeromv[2];
#if CONFIG_GLOBAL_MOTION
BLOCK_SIZE bsize = mi->mbmi.sb_type;
#endif // CONFIG_GLOBAL_MOTION
#if CONFIG_REF_MV
int idx, all_zero = 1;
#if CONFIG_GLOBAL_MOTION
MV_REFERENCE_FRAME rf[2];
BLOCK_SIZE bsize = mi->mbmi.sb_type;
#endif
#endif
#endif // CONFIG_GLOBAL_MOTION
#endif // CONFIG_REF_MV
#if CONFIG_EXT_INTER
av1_update_mv_context(cm, xd, mi, ref_frame, mv_ref_list, -1, mi_row, mi_col,
#if CONFIG_REF_MV
......
......@@ -4900,7 +4900,7 @@ static void write_global_motion(AV1_COMP *cpi, aom_writer *w) {
// With ref-mv, clearing unused global motion models here is
// unsafe, and we need to rely on the recode loop to do it
// instead. See av1_find_mv_refs for details.
if (!cpi->global_motion_used[frame]) {
if (!cpi->td.rd_counts.global_motion_used[frame]) {
set_default_warp_params(&cm->global_motion[frame]);
}
#endif
......
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