libvpx: Pull from upstream

source/libvpx/vpx_scale/generic/yv12config.c

 /*
  *  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.
  */
 
 #include <assert.h>
 
-#include "./vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "vpx_mem/vpx_mem.h"
 #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
 #include "vp9/common/vp9_common.h"
 #endif
 
 /****************************************************************************
 *  Exports
 ****************************************************************************/
 
@@ skipping 211 matching lines @@
     ybf->y_stride = y_stride;
 
     ybf->uv_crop_width = (width + ss_x) >> ss_x;
     ybf->uv_crop_height = (height + ss_y) >> ss_y;
     ybf->uv_width = uv_width;
     ybf->uv_height = uv_height;
     ybf->uv_stride = uv_stride;
 
     ybf->border = border;
     ybf->frame_size = (int)frame_size;
+    ybf->subsampling_x = ss_x;
+    ybf->subsampling_y = ss_y;
 
 #if CONFIG_VP9_HIGHBITDEPTH
     if (use_highbitdepth) {
       // Store uint16 addresses when using 16bit framebuffers
       uint8_t *p = CONVERT_TO_BYTEPTR(ybf->buffer_alloc);
       ybf->y_buffer = p + (border * y_stride) + border;
       ybf->u_buffer = p + yplane_size +
           (uv_border_h * uv_stride) + uv_border_w;
       ybf->v_buffer = p + yplane_size + uvplane_size +
           (uv_border_h * uv_stride) + uv_border_w;
@@ skipping 38 matching lines @@
     vp9_free_frame_buffer(ybf);
     return vp9_realloc_frame_buffer(ybf, width, height, ss_x, ss_y,
 #if CONFIG_VP9_HIGHBITDEPTH
                                     use_highbitdepth,
 #endif
                                     border, NULL, NULL, NULL);
   }
   return -2;
 }
 #endif