From: Jingning Han <jingning@google.com>
Date: Fri, 30 Oct 2015 20:00:48 +0000 (-0700)
Subject: Fix a switch condition in select_tx_block
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47c7fd984e825a664c4d44c173e61240e8a32fc4;p=libvpx

Fix a switch condition in select_tx_block

Change-Id: I3d90a0286c5ef559b91ad298db97e8990becf85f
---

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 0dbbd81ab..8d9393582 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1784,8 +1784,8 @@ static void select_tx_block(const VP10_COMP *cpi, MACROBLOCK *x,
     tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, plane, block,
                   plane_bsize, coeff_ctx, rate, dist, bsse, skip);
 
-    if (RDCOST(x->rdmult, x->rddiv, *rate, *dist) >=
-        RDCOST(x->rdmult, x->rddiv, zero_blk_rate, *bsse) && (*skip == 0) &&
+    if ((RDCOST(x->rdmult, x->rddiv, *rate, *dist) >=
+         RDCOST(x->rdmult, x->rddiv, zero_blk_rate, *bsse) || *skip == 1) &&
         !xd->lossless[mbmi->segment_id]) {
       *rate = zero_blk_rate;
       *dist = *bsse;