libvpx: Pull from upstream

Current HEAD: 858fe955ae5a42a0006c974b0837df18b246986f

git log from upstream:
858fe955a vp9: fix definition for VP9E_SET_POSTENCODE_DROP
fa5083e8e Fix segmentation fault in hbd path
759d1de9d vp8 dec: Add flag to bring up threads.
38d98d870 vp8 idct dequant: resolve missing declarations
2e39962d7 vp8 blend: resolve missing declarations
0aeaf29b1 vp8 overlaps: resolve missing declaration
f485c67d0 vp9_get_blockiness: resolve missing declaration
5aeaf43c4 vp8 multi dimensional search: resolve missing declarations
8466728f8 vp8_copy32xn: resolve missing declaration
f479beeeb vpx_filter: resolve missing declarations
948e51696 vpx_clear_system_state: resolve missing declaration
9cf2e851d vp9 intra pred test: resolve -Wuninitialized warning
57d476bd8 arm neon: resolve missing declarations
46e17f0cb Fix OOB memory access on fuzzed data
6efdd9ad4 fix vp9 fdct_quant
ad57c72b9 VP9 firstpass: Bugfix when mi_col_start/end is odd
3271a7ed6 Increase memory size in non-greedy-mv
23f8b8317 Build pyramid motion field
c4c5c1d7e vp9: psnr diff thres for single vs multi threading.
95ac0cc9f Adaptively choose block sizes in temporal filtering
<...>

Test: none
BUG=b/122675483

Change-Id: I392f4fab4355476fcbe944986b9c7399c1888d07

1 files changed, 6 insertions, 6 deletions

diff --git a/libvpx/vp9/vp9_iface_common.h b/libvpx/vp9/vp9_iface_common.h
index d68872750..a1921db63 100644
--- a/libvpx/vp9/vp9_iface_common.h
+++ b/libvpx/vp9/vp9_iface_common.h
@@ -7,17 +7,17 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef VP9_VP9_IFACE_COMMON_H_
-#define VP9_VP9_IFACE_COMMON_H_
+#ifndef VPX_VP9_VP9_IFACE_COMMON_H_
+#define VPX_VP9_VP9_IFACE_COMMON_H_
 
 #include "vpx_ports/mem.h"
 
 static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
                             void *user_priv) {
   /** vpx_img_wrap() doesn't allow specifying independent strides for
-    * the Y, U, and V planes, nor other alignment adjustments that
-    * might be representable by a YV12_BUFFER_CONFIG, so we just
-    * initialize all the fields.*/
+   * the Y, U, and V planes, nor other alignment adjustments that
+   * might be representable by a YV12_BUFFER_CONFIG, so we just
+   * initialize all the fields.*/
   int bps;
   if (!yv12->subsampling_y) {
     if (!yv12->subsampling_x) {
@@ -142,4 +142,4 @@ static VP9_REFFRAME ref_frame_to_vp9_reframe(vpx_ref_frame_type_t frame) {
   assert(0 && "Invalid Reference Frame");
   return VP9_LAST_FLAG;
 }
-#endif  // VP9_VP9_IFACE_COMMON_H_
+#endif  // VPX_VP9_VP9_IFACE_COMMON_H_