ref: 120690989b8bc3df738b06e9a81bcd0526b14aaf
parent: d7290d4974596bd93734a4444a40977e6f5748db
parent: a653c9d2867706b068121cc51a03383b56865dc3
author: Ronald S. Bultje <rbultje@google.com>
date: Wed Nov 14 12:05:46 EST 2012
Merge "fix costing bug in pick_uv_sb_mode." into experimental
--- a/vp9/encoder/rdopt.c
+++ b/vp9/encoder/rdopt.c
@@ -1875,8 +1875,7 @@
super_block_uvrd_8x8(x, &this_rate_tokenonly,
&this_distortion, IF_RTCD(&cpi->rtcd), &s);
this_rate = this_rate_tokenonly +
- x->mbmode_cost[x->e_mbd.frame_type]
- [x->e_mbd.mode_info_context->mbmi.mode];
+ x->intra_uv_mode_cost[x->e_mbd.frame_type][mode];
this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion);
if (this_rd < best_rd) {