Merge remote branch 'origin/master' into experimental

Change-Id: I0aaefeafeb6b2b07ec792024edf4751f2860aa23
2011-08-31 00:05:09 -04:00
parent 06f30739a5 800b70a3bf
commit f7084f35da
1 changed files with 5 additions and 1 deletions
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1255,7 +1255,11 @@ int vp8cx_encode_inter_macroblock
                    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] ++;