From: John Koleszar <jkoleszar@google.com>
Date: Fri, 11 Mar 2011 16:06:09 +0000 (-0800)
Subject: Merge "1 Pass CQ and VBR bug fixes"
X-Git-Tag: v0.9.7~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=170b87390ea6bfa2a4de57bf0babd75857d0ab2b;p=libvpx

Merge "1 Pass CQ and VBR bug fixes"
---

170b87390ea6bfa2a4de57bf0babd75857d0ab2b
diff --cc vp8/encoder/onyx_if.c
index c028db142,9b49f2dcf..ce262b1f4
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -1534,11 -1540,10 +1536,8 @@@ void vp8_init_config(VP8_PTR ptr, VP8_C
      cpi->total_actual_bits            = 0;
      cpi->total_target_vs_actual       = 0;
  
-     // change includes all joint functionality
-    vp8_change_config(ptr, oxcf);
- 
  #if VP8_TEMPORAL_ALT_REF
  
 -    cpi->use_weighted_temporal_filter = 0;
 -
      {
          int i;