libvpx: Pull from upstream

source/libvpx/vp9/decoder/vp9_dboolhuff.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_DBOOLHUFF_H_
 #define VP9_DECODER_VP9_DBOOLHUFF_H_
 
 #include <stddef.h>
 #include <limits.h>
 
 #include "./vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_integer.h"
 
 typedef size_t VP9_BD_VALUE;
 
-#define VP9_BD_VALUE_SIZE ((int)sizeof(VP9_BD_VALUE)*CHAR_BIT)
+#define BD_VALUE_SIZE ((int)sizeof(VP9_BD_VALUE)*CHAR_BIT)
 
 typedef struct {
   const uint8_t *buffer_end;
   const uint8_t *buffer;
   VP9_BD_VALUE value;
   int count;
   unsigned int range;
 } vp9_reader;
 
 DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]);
@@ skipping 11 matching lines @@
   int count;
   unsigned int range;
   unsigned int split = 1 + (((br->range - 1) * probability) >> 8);
 
   if (br->count < 0)
     vp9_reader_fill(br);
 
   value = br->value;
   count = br->count;
 
-  bigsplit = (VP9_BD_VALUE)split << (VP9_BD_VALUE_SIZE - 8);
+  bigsplit = (VP9_BD_VALUE)split << (BD_VALUE_SIZE - 8);
 
   range = split;
 
   if (value >= bigsplit) {
     range = br->range - split;
     value = value - bigsplit;
     bit = 1;
   }
 
   {
@@ skipping 18 matching lines @@
 
   for (bit = bits - 1; bit >= 0; bit--)
     z |= vp9_read_bit(br) << bit;
 
   return z;
 }
 
 int vp9_reader_has_error(vp9_reader *r);
 
 #endif  // VP9_DECODER_VP9_DBOOLHUFF_H_