ref: 040dc8c9450a8b7ebb100a38745654962ce3f076
parent: a42ab027fd784150e11497fc0f00ec894cbfd1c7
parent: e63aaf9ad1021d7a12f6a3e12ac32742ebbf7dbe
author: Yaowu Xu <[email protected]>
date: Mon Nov 18 10:43:41 EST 2013
Merge "Fixed a bug in commit a4a5a210"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -612,8 +612,9 @@
// TODO(jingning): temporarily enabled only for luma component
rd = MIN(rd1, rd2);
- if (!xd->lossless && plane == 0)
- x->zcoeff_blk[tx_size][block] = rd1 > rd2 || !xd->plane[plane].eobs[block];
+ if (plane == 0)
+ x->zcoeff_blk[tx_size][block] = !xd->plane[plane].eobs[block] ||
+ (rd1 > rd2 && !xd->lossless);
args->this_rate += args->rate;
args->this_dist += args->dist;