Merge "[svc] Finalize first version of 2nd pass rc"

diff --cc vp9/encoder/vp9_onyx_if.c
index 78c7f8eada06b5b4695e4238723f7cf288f2328d,e5958dbe05711c3cf428a2f7fbd5bfae6e9be7ad..754122e1005ccb4e90021139db4e5a7a9a217fd8
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -1367,12 -1802,12 +1370,12 @@@ VP9_COMP *vp9_create_compressor(VP9_CON
        cpi->twopass.stats_in_start = oxcf->two_pass_stats_in.buf;
        cpi->twopass.stats_in = cpi->twopass.stats_in_start;
        cpi->twopass.stats_in_end = &cpi->twopass.stats_in[packets - 1];
-     }
  
-     vp9_init_second_pass(cpi);
+       vp9_init_second_pass(cpi);
+     }
    }
  
 -  vp9_set_speed_features(cpi);
 +  set_speed_features(cpi);
  
    // Default rd threshold factors for mode selection
    for (i = 0; i < BLOCK_SIZES; ++i) {