shithub: libvpx

Info  •  Files  •  Log  •  Branches

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;