ref: 204d1b70587ef3698bcce1e337da934532dd65b5
parent: d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709
parent: 059c0ba5d43a8833bf3b21c40984ce130bfefd56
author: Ronald S. Bultje <[email protected]>
date: Tue Jul 9 05:54:48 EDT 2013
Merge "Unbreak lossless."
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3506,7 +3506,7 @@
}
}
} 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.