Merge "Fix an IOC issue in vp9_rd_pick_inter_mode_sb"

This commit is contained in:
Jingning Han 2014-10-06 09:29:29 -07:00 committed by Gerrit Code Review
commit 1b8c57e915

View File

@ -2989,7 +2989,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
}
if (cpi->sf.alt_ref_search_fp)
if (!cm->show_frame)
if (!cm->show_frame && x->pred_mv_sad[GOLDEN_FRAME] < INT_MAX)
if (x->pred_mv_sad[ALTREF_FRAME] > (x->pred_mv_sad[GOLDEN_FRAME] << 1))
mode_skip_mask[ALTREF_FRAME] |= INTER_ALL;