From: Paul Wilkins <paulwilkins@google.com>
Date: Fri, 22 Mar 2013 17:53:12 +0000 (-0700)
Subject: Merge "Minor code clean up" into experimental
X-Git-Tag: v1.3.0~1151^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfe7666142d0d3094ed6dffe59f02c5abe7c4848;p=libvpx

Merge "Minor code clean up" into experimental
---

bfe7666142d0d3094ed6dffe59f02c5abe7c4848
diff --cc vp9/encoder/vp9_onyx_if.c
index 844bd986b,7a169e4f3..66ab42837
--- a/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");