Merge "Minor code clean up" into experimental

diff --cc vp9/encoder/vp9_onyx_if.c
index 844bd986b1d9a8a9ef59302aa975a726460a092a,7a169e4f378da886773188e70c02c16dea8e3404..66ab428374b22175ed603f314ec4e8b4783ded3e
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -879,10 -877,8 +877,8 @@@ static void alloc_raw_frame_buffers(VP9
      vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
                         "Failed to allocate lag buffers");
  
- #if VP9_TEMPORAL_ALT_REF
- 
    if (vp8_yv12_alloc_frame_buffer(&cpi->alt_ref_buffer,
 -                                  cpi->oxcf.Width, cpi->oxcf.Height,
 +                                  cpi->oxcf.width, cpi->oxcf.height,
                                    VP9BORDERINPIXELS))
      vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
                         "Failed to allocate altref buffer");

diff --cc vp9/encoder/vp9_temporal_filter.c
Simple merge