commit 800b70a3bf4cc3ba6946f54995c266d2730fe257
author John Koleszar <jkoleszar@google.com> Tue Aug 30 12:49:24 2011 -0700
committer Code Review <code-review@webmproject.org> Tue Aug 30 12:49:24 2011 -0700
tree fa45dc9ea6e434b8e21832b8beb3f280a2e87f2d
parent 1f20202e2c6c137dd2e3464e2b14bba0fdc289ce
parent bc9293b8159b68e64d9b73e118b90f9fdadd6d80

Merge "Recalculate zbin_extra only if regular quantizer is being used"

vp8/encoder/encodeframe.c

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 5d4e7e7..a194259 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1257,7 +1257,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] ++;