libvpx: Pull from upstream

source/libvpx/vp9/decoder/vp9_onyxd_int.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 VP9_DECODER_VP9_ONYXD_INT_H_
 #define VP9_DECODER_VP9_ONYXD_INT_H_
-#include "vpx_ports/config.h"
-#include "vp9/common/vp9_onyxd.h"
+#include "./vpx_config.h"
+#include "vp9/decoder/vp9_onyxd.h"
 #include "vp9/decoder/vp9_treereader.h"
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/decoder/vp9_dequantize.h"
 
 // #define DEC_DEBUG
 
 typedef struct {
   int ithread;
   void *ptr1;
   void *ptr2;
 } DECODETHREAD_DATA;
 
 typedef struct {
   MACROBLOCKD  mbd;
   int mb_row;
   int current_mb_col;
   short *coef_ptr;
 } MB_ROW_DEC;
 
 typedef struct {
   int const *scan;
   int const *scan_8x8;
-  UINT8 const *ptr_block2leftabove;
+  uint8_t const *ptr_block2leftabove;
   vp9_tree_index const *vp9_coef_tree_ptr;
   unsigned char *norm_ptr;
-  UINT8 *ptr_coef_bands_x;
-  UINT8 *ptr_coef_bands_x_8x8;
+  uint8_t *ptr_coef_bands_x;
+  uint8_t *ptr_coef_bands_x_8x8;
 
   ENTROPY_CONTEXT_PLANES *A;
   ENTROPY_CONTEXT_PLANES *L;
 
-  INT16 *qcoeff_start_ptr;
+  int16_t *qcoeff_start_ptr;
 
-  vp9_prob const *coef_probs[BLOCK_TYPES];
+  vp9_prob const *coef_probs_4x4[BLOCK_TYPES_4X4];
   vp9_prob const *coef_probs_8x8[BLOCK_TYPES_8X8];
   vp9_prob const *coef_probs_16X16[BLOCK_TYPES_16X16];
 
-  UINT8 eob[25];
+  uint8_t eob[25];
 
 } DETOK;
 
 typedef struct VP9Decompressor {
   DECLARE_ALIGNED(16, MACROBLOCKD, mb);
 
   DECLARE_ALIGNED(16, VP9_COMMON, common);
 
   VP9D_CONFIG oxcf;
 
@@ skipping 32 matching lines @@
   } while(0)
 #else
 #define CHECK_MEM_ERROR(lval,expr) do {\
     lval = (expr); \
     if(!lval) \
       vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
                          "Failed to allocate "#lval);\
   } while(0)
 #endif
 
-#endif  // __INC_ONYXD_INT_H
+#endif  // VP9_DECODER_VP9_TREEREADER_H_