From: Ronald S. Bultje <rbultje@google.com>
Date: Tue, 9 Jul 2013 16:46:37 +0000 (-0700)
Subject: Unbreak lossless.
X-Git-Tag: v1.3.0~930^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=059c0ba5d43a8833bf3b21c40984ce130bfefd56;p=platform%2Fupstream%2Flibvpx.git

Unbreak lossless.

Change-Id: I8130ec9b5371c65e885f245a5ac73840c23cb4a1
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index b485ca4..cd32afc 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3509,7 +3509,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
           }
         }
       } else if (mb_skip_allowed && ref_frame != INTRA_FRAME &&
-                 this_mode != SPLITMV) {
+                 this_mode != SPLITMV && !xd->lossless) {
         if (RDCOST(x->rdmult, x->rddiv, rate_y + rate_uv, distortion2) <
             RDCOST(x->rdmult, x->rddiv, 0, total_sse)) {
           // Add in the cost of the no skip flag.