diff options
| author | Jingning Han <jingning@google.com> | 2014-07-23 10:34:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-23 10:34:54 -0700 |
| commit | 66d5757695fd3e66a20941759b47d88189fafdb5 (patch) | |
| tree | cfc85e0cadeddf931f70b66f6e7d787a5beebb15 | |
| parent | 0e5edf4eae6ac12550de90ba8ba3695257be639c (diff) | |
| parent | 353819103eb2c72f0d6704c5f61c5572e62be8e7 (diff) | |
| download | libvpx-66d5757695fd3e66a20941759b47d88189fafdb5.tar libvpx-66d5757695fd3e66a20941759b47d88189fafdb5.tar.gz libvpx-66d5757695fd3e66a20941759b47d88189fafdb5.tar.bz2 libvpx-66d5757695fd3e66a20941759b47d88189fafdb5.zip | |
Merge "Remove redundant num_refs definition"
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e221f3f17..6663c2a33 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2024,7 +2024,6 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } } - 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) |