Merge "Reduce the cpi->scaled_ref_idx array size by 1."

diff --cc vp9/common/vp9_onyxc_int.h
Simple merge

diff --cc vp9/encoder/vp9_encoder.c
index 51c9337,6404fa0..e902a83
--- 1/vp9/encoder/vp9_encoder.c
--- 2/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@@ -6392,10 -6342,10 +6392,10 @@@ int vp9_get_compressed_data(VP9_COMP *c
      level_rc_framerate(cpi, arf_src_index);
  
    if (cpi->oxcf.pass != 0 || cpi->use_svc || frame_is_intra_only(cm) == 1) {
-     for (i = 0; i < MAX_REF_FRAMES; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX;
+     for (i = 0; i < REFS_PER_FRAME; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX;
    }
  
 -  if (arf_src_index && cpi->sf.enable_tpl_model) {
 +  if (cpi->twopass.gf_group.index == 1 && cpi->sf.enable_tpl_model) {
      vp9_estimate_qp_gop(cpi);
      setup_tpl_stats(cpi);
    }

diff --cc vp9/encoder/vp9_encoder.h
Simple merge