| commit | 1b8c57e915d3041974c66d3649da1e7cf8cb7aff | [log] [tgz] |
|---|---|---|
| author | Jingning Han <jingning@google.com> | Mon Oct 06 09:29:29 2014 -0700 |
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | Mon Oct 06 09:29:29 2014 -0700 |
| tree | 7f9da05bac4ba465afa48bf703ebfa87c94b506a | |
| parent | 5966acc1be3e09e02cc9b22237dd6edc7d2b501d [diff] | |
| parent | 085b97aa5c17afbc07c8a342ba08a0bbc5b1b523 [diff] |
Merge "Fix an IOC issue in vp9_rd_pick_inter_mode_sb"
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 1d37fe4..20a4b70 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c
@@ -2989,7 +2989,7 @@ } 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;