Merge "Removing redundant assignments."

diff --cc vp9/encoder/vp9_onyx_if.c
index 3619ec89e8e81eb61296dbbc4bcf101fa9fe530a,c4b993406bbb21cc05c0aaf4a509a7d855417cbe..2529c2ecfb63f3f338447af7cbeab1d44307ea22
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -2756,13 -2753,16 +2756,9 @@@ static void encode_frame_to_data_rate(V
      // Don't increment frame counters if this was an altref buffer
      // update not a real frame
      ++cm->current_video_frame;
 -    if (cpi->use_svc) {
 -      LAYER_CONTEXT *lc;
 -      if (cpi->svc.number_temporal_layers > 1) {
 -        lc = &cpi->svc.layer_context[cpi->svc.temporal_layer_id];
 -      } else {
 -        lc = &cpi->svc.layer_context[cpi->svc.spatial_layer_id];
 -      }
 -      ++lc->current_video_frame_in_layer;
 -    }
 +    if (cpi->use_svc)
 +      vp9_inc_frame_in_layer(&cpi->svc);
    }
- 
-   // restore prev_mi
-   cm->prev_mi = cm->prev_mip + cm->mi_stride + 1;
-   cm->prev_mi_grid_visible = cm->prev_mi_grid_base + cm->mi_stride + 1;
  }
  
  static void SvcEncode(VP9_COMP *cpi, size_t *size, uint8_t *dest,