diff options
| author | Alex Converse <aconverse@google.com> | 2013-12-03 10:51:13 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-03 10:51:13 -0800 |
| commit | f63c75de841429caafe987e80b51c5dc7283d1bb (patch) | |
| tree | d5e23bdecef7514d15e855b6764f75a6764c5b83 /vp9/encoder/vp9_rdopt.c | |
| parent | b88b49a7bc6a5b08ae0af0304eee67ced7d55352 (diff) | |
| parent | 2360a5f0938a4cbd93cc04ecab65f89fdab4f0a4 (diff) | |
| download | libvpx-f63c75de841429caafe987e80b51c5dc7283d1bb.tar libvpx-f63c75de841429caafe987e80b51c5dc7283d1bb.tar.gz libvpx-f63c75de841429caafe987e80b51c5dc7283d1bb.tar.bz2 libvpx-f63c75de841429caafe987e80b51c5dc7283d1bb.zip | |
Merge "Remove plane_block_idx."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 087d036ca..65cf5c797 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1055,7 +1055,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, else x->fwd_txm4x4(src_diff, coeff, 8); - vp9_regular_quantize_b_4x4(x, 4, block, so->scan, so->iscan); + vp9_regular_quantize_b_4x4(x, 0, block, so->scan, so->iscan); ratey += cost_coeffs(x, 0, block, tempa + idx, templ + idy, TX_4X4, so->scan, so->neighbors); @@ -1541,7 +1541,7 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi, coeff = BLOCK_OFFSET(p->coeff, k); x->fwd_txm4x4(raster_block_offset_int16(BLOCK_8X8, k, p->src_diff), coeff, 8); - vp9_regular_quantize_b_4x4(x, 4, k, so->scan, so->iscan); + vp9_regular_quantize_b_4x4(x, 0, k, so->scan, so->iscan); thisdistortion += vp9_block_error(coeff, BLOCK_OFFSET(pd->dqcoeff, k), 16, &ssz); thissse += ssz; |