ref: 66d5757695fd3e66a20941759b47d88189fafdb5
parent: 0e5edf4eae6ac12550de90ba8ba3695257be639c
parent: 353819103eb2c72f0d6704c5f61c5572e62be8e7
author: Jingning Han <[email protected]>
date: Wed Jul 23 06:34:54 EDT 2014
Merge "Remove redundant num_refs definition"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2024,7 +2024,6 @@
MACROBLOCKD *xd = &x->e_mbd;
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
const int is_comp_pred = has_second_ref(mbmi);
- const int num_refs = is_comp_pred ? 2 : 1;
const int this_mode = mbmi->mode;
int_mv *frame_mv = mode_mv[this_mode];
int i;
@@ -2091,7 +2090,7 @@
}
}
- for (i = 0; i < num_refs; ++i) {+ for (i = 0; i < is_comp_pred + 1; ++i) {cur_mv[i] = frame_mv[refs[i]];
// Clip "next_nearest" so that it does not extend to far out of image
if (this_mode != NEWMV)