summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-01-29 12:49:42 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-01-29 12:49:42 -0800
commit5a9da2d906d17019ad8c70e052a38dda802f3a81 (patch)
tree2530f12d0c9047d06e6854e1c4d8b6ed4c85e207 /vp9
parent64401f838f6cfa53b73e4507155ba9d64574d4e0 (diff)
parentffc2e4f4af34a202dd2a8fd47ebe1af5893e5e0c (diff)
downloadlibvpx-5a9da2d906d17019ad8c70e052a38dda802f3a81.tar
libvpx-5a9da2d906d17019ad8c70e052a38dda802f3a81.tar.gz
libvpx-5a9da2d906d17019ad8c70e052a38dda802f3a81.tar.bz2
libvpx-5a9da2d906d17019ad8c70e052a38dda802f3a81.zip
Merge "Fix block pointer corruption in intra8x8 prediction with 4x4 transform." into experimental
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 5e57cf54a..ebe08db90 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1476,6 +1476,8 @@ static int64_t rd_pick_intra8x8block(VP9_COMP *cpi, MACROBLOCK *x, int ib,
&ta0, &tl0,
TX_4X4);
}
+ b = &xd->block[ib];
+ be = &x->block[ib];
rate += rate_t;
}