diff options
| author | Jingning Han <jingning@google.com> | 2014-09-15 15:34:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-15 15:34:22 -0700 |
| commit | f897dd5f094c552c4d4eef72fd6500513de1d85a (patch) | |
| tree | 452c24d96cdeccb64cb2b5411f1f87b28b361c4f /vp9/encoder/vp9_rdopt.c | |
| parent | fe2cc873dc7656ffd1d3c24eb51e270a7f0f8eba (diff) | |
| parent | 73805bfa706994fe8f430e2328527de6e9f1107b (diff) | |
| download | libvpx-f897dd5f094c552c4d4eef72fd6500513de1d85a.tar libvpx-f897dd5f094c552c4d4eef72fd6500513de1d85a.tar.gz libvpx-f897dd5f094c552c4d4eef72fd6500513de1d85a.tar.bz2 libvpx-f897dd5f094c552c4d4eef72fd6500513de1d85a.zip | |
Merge "Fix format in vp9_rd_pick_inter_mode_sub8x8"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 6710ec71e..b0522c4e0 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3761,11 +3761,11 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, single_rd = RDCOST(x->rdmult, x->rddiv, single_rate, distortion2); hybrid_rd = RDCOST(x->rdmult, x->rddiv, hybrid_rate, distortion2); - if (!comp_pred && single_rd < best_pred_rd[SINGLE_REFERENCE]) { + if (!comp_pred && single_rd < best_pred_rd[SINGLE_REFERENCE]) best_pred_rd[SINGLE_REFERENCE] = single_rd; - } else if (comp_pred && single_rd < best_pred_rd[COMPOUND_REFERENCE]) { + else if (comp_pred && single_rd < best_pred_rd[COMPOUND_REFERENCE]) best_pred_rd[COMPOUND_REFERENCE] = single_rd; - } + if (hybrid_rd < best_pred_rd[REFERENCE_MODE_SELECT]) best_pred_rd[REFERENCE_MODE_SELECT] = hybrid_rd; } |