From: Adrian Grange <agrange@google.com>
Date: Wed, 4 Mar 2015 18:54:10 +0000 (-0800)
Subject: Merge "Make encoder buffer allocation dynamic"
X-Git-Tag: v1.4.0~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a34a04261547a29527ab0eac5d0d5482c98f8061;p=libvpx

Merge "Make encoder buffer allocation dynamic"
---

a34a04261547a29527ab0eac5d0d5482c98f8061
diff --cc vp9/encoder/vp9_encodeframe.c
index 2bdb9915c,415daf0c5..3125a0eb7
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -709,11 -713,12 +710,13 @@@ static void choose_partitioning(VP9_COM
  
    if (!is_key_frame) {
      MB_MODE_INFO *mbmi = &xd->mi[0].src_mi->mbmi;
 -    unsigned int var = 0, uv_sse;
 +    unsigned int uv_sad;
  #if GLOBAL_MOTION
 -    unsigned int y_sse;
 +    unsigned int y_sad;
 +    BLOCK_SIZE bsize;
  #endif
+     const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_buffer(cpi, LAST_FRAME);
+     assert(yv12 != NULL);
      vp9_setup_pre_planes(xd, 0, yv12, mi_row, mi_col,
          &cm->frame_refs[LAST_FRAME - 1].sf);
      mbmi->ref_frame[0] = LAST_FRAME;