Merge "Cleaning up vp9_bitstream.{c, h} files."

diff --cc vp9/encoder/vp9_bitstream.c
index 55eaaf9,06a2f00..14600e8
--- 1/vp9/encoder/vp9_bitstream.c
--- 2/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@@ -14,21 -14,20 +14,21 @@@
  
  #include "vpx/vpx_encoder.h"
  #include "vpx_mem/vpx_mem.h"
 +#include "vpx_ports/mem_ops.h"
  
+ #include "vp9/common/vp9_entropy.h"
  #include "vp9/common/vp9_entropymode.h"
  #include "vp9/common/vp9_entropymv.h"
- #include "vp9/common/vp9_tile_common.h"
- #include "vp9/common/vp9_seg_common.h"
- #include "vp9/common/vp9_pred_common.h"
- #include "vp9/common/vp9_entropy.h"
  #include "vp9/common/vp9_mvref_common.h"
- #include "vp9/common/vp9_systemdependent.h"
  #include "vp9/common/vp9_pragmas.h"
+ #include "vp9/common/vp9_pred_common.h"
+ #include "vp9/common/vp9_seg_common.h"
+ #include "vp9/common/vp9_systemdependent.h"
+ #include "vp9/common/vp9_tile_common.h"
  
- #include "vp9/encoder/vp9_mcomp.h"
- #include "vp9/encoder/vp9_encodemv.h"
  #include "vp9/encoder/vp9_bitstream.h"
+ #include "vp9/encoder/vp9_encodemv.h"
+ #include "vp9/encoder/vp9_mcomp.h"
  #include "vp9/encoder/vp9_segmentation.h"
  #include "vp9/encoder/vp9_subexp.h"
  #include "vp9/encoder/vp9_tokenize.h"
@@@ -62,8 -61,15 +62,8 @@@ static void write_inter_mode(vp9_write
                    &inter_mode_encodings[INTER_OFFSET(mode)]);
  }
  
- void vp9_encode_unsigned_max(struct vp9_write_bit_buffer *wb,
-                              int data, int max) {
 -static INLINE void write_be32(uint8_t *p, int value) {
 -  p[0] = value >> 24;
 -  p[1] = value >> 16;
 -  p[2] = value >> 8;
 -  p[3] = value;
 -}
 -
+ static void encode_unsigned_max(struct vp9_write_bit_buffer *wb,
+                                 int data, int max) {
    vp9_wb_write_literal(wb, data, get_unsigned_bits(max));
  }