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_scale/yv12config.h"
 #include "vpx_mem/vpx_mem.h"
-#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif
+#include "vpx_ports/mem.h"
 
 /****************************************************************************
 *  Exports
 ****************************************************************************/
 
 /****************************************************************************
  *
  ****************************************************************************/
 #define yv12_align_addr(addr, align) \
     (void*)(((size_t)(addr) + ((align) - 1)) & (size_t)-(align))
@@ skipping 268 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, byte_alignment, NULL, NULL, NULL);
   }
   return -2;
 }
 #endif