Merge "1 Pass CQ and VBR bug fixes"

diff --cc vp8/encoder/onyx_if.c
index c028db1424e2b23e18fd001d71d9e6545e5d2042,9b49f2dcff6c1e7a69bc41f612889ccadc18cf48..ce262b1f40d508e6f64682affa04cbe2496aed5e
--- 1/vp8/encoder/onyx_if.c
--- 2/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;