ref: 4551743ceb55719c73f85075ab00e12f4bd6b7b2
parent: 525dba8f7b0234fb07f1fb1f097957c0a2d99b32
parent: 800b70a3bf4cc3ba6946f54995c266d2730fe257
author: John Koleszar <jkoleszar@google.com>
date: Tue Aug 30 20:05:05 EDT 2011
Merge remote branch 'internal/upstream' into HEAD
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1613,7 +1613,11 @@
cpi->zbin_mode_boost = MV_ZBIN_BOOST;
}
}
- vp8_update_zbin_extra(cpi, x);
+
+ /* The fast quantizer doesn't use zbin_extra, only do so with
+ * the regular quantizer. */
+ if (cpi->sf.improved_quant)
+ vp8_update_zbin_extra(cpi, x);
}
cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++;
--
⑨