diff options
author | Ronald S. Bultje <rbultje@google.com> | 2012-10-22 11:03:25 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-22 11:03:26 -0700 |
commit | 6e5cb12886e464c7f744bb905ebccfde5bf378b9 (patch) | |
tree | 8891ab23e1458d9140f97d43bb9cd7aeb50dbea8 /vp8/encoder/rdopt.c | |
parent | 788d7f10d4e03b58b02c14b961200ccb3134c4f0 (diff) | |
parent | 0d4e82aa4e59d6c4d52e6af38baf1dbf15329afd (diff) | |
download | libvpx-6e5cb12886e464c7f744bb905ebccfde5bf378b9.tar libvpx-6e5cb12886e464c7f744bb905ebccfde5bf378b9.tar.gz libvpx-6e5cb12886e464c7f744bb905ebccfde5bf378b9.tar.bz2 libvpx-6e5cb12886e464c7f744bb905ebccfde5bf378b9.zip |
Merge "Fix use of wrong context in i8x8 coefficient cost calculation." into experimental
Diffstat (limited to 'vp8/encoder/rdopt.c')
-rw-r--r-- | vp8/encoder/rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 4b9e90725..b08002692 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1578,8 +1578,8 @@ static int64_t rd_pick_intra8x8block(VP8_COMP *cpi, MACROBLOCK *x, int ib, ta0 = *(a + vp8_block2above[ib]); ta1 = *(a + vp8_block2above[ib + 1]); - tl0 = *(l + vp8_block2above[ib]); - tl1 = *(l + vp8_block2above[ib + 4]); + tl0 = *(l + vp8_block2left[ib]); + tl1 = *(l + vp8_block2left[ib + 4]); rate_t = cost_coeffs(x, xd->block + ib, PLANE_TYPE_Y_WITH_DC, &ta0, &tl0, TX_4X4); rate_t += cost_coeffs(x, xd->block + ib + 1, PLANE_TYPE_Y_WITH_DC, |