libvpx: Pull from upstream

source/libvpx/vpx_scale/yv12config.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef YV12_CONFIG_H
 #define YV12_CONFIG_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "vpx/vpx_external_frame_buffer.h"
 #include "vpx/vpx_integer.h"
 
 #define VP8BORDERINPIXELS       32
 #define VP9INNERBORDERINPIXELS  96
 #define VP9BORDERINPIXELS      160
 #define VP9_INTERP_EXTEND        4
 
   typedef struct yv12_buffer_config {
     int   y_width;
     int   y_height;
@@ skipping 29 matching lines @@
 
   int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
                                   int width, int height, int border);
   int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
                                     int width, int height, int border);
   int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf);
 
   int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
                              int width, int height, int ss_x, int ss_y,
                              int border);
+
+  // Updates the yv12 buffer config with the frame buffer. If ext_fb is not
+  // NULL then libvpx is using external frame buffers. The function will
+  // check if the frame buffer is big enough to fit the decoded frame and
+  // try to reallocate the frame buffer. If ext_fb is not NULL and the frame
+  // buffer is not big enough libvpx will call cb with minimum size in bytes.
+  //
+  // Returns 0 on success. Returns < 0 on failure.
   int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
                                int width, int height, int ss_x, int ss_y,
-                               int border);
+                               int border,
+                               vpx_codec_frame_buffer_t *ext_fb,
+                               vpx_realloc_frame_buffer_cb_fn_t cb,
+                               void *user_priv);
   int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // YV12_CONFIG_H