Merge "Don't override active_worst_quality in 2 pass"

5c756005 · John Koleszar · Code Review · 52490354 · abc9958c · 5c756005
Commit 5c756005 authored May 06, 2011 by John Koleszar Committed by Code Review May 06, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vp8/encoder/ratectrl.c vp8/encoder/ratectrl.c +2 -1

No files found.
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -416,7 +416,8 @@ static void calc_iframe_target_size(VP8_COMP *cpi)

    // TODO: if we separate rate targeting from Q targetting, move this.
    // Reset the active worst quality to the baseline value for key frames.
-    cpi->active_worst_quality = cpi->worst_quality;
+    if (cpi->pass != 2)
+        cpi->active_worst_quality = cpi->worst_quality;

 #if 0
    {