From: John Koleszar <jkoleszar@google.com>
Date: Thu, 30 Jun 2011 12:46:49 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream-experimental' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dfd0060176ad0d6f5beb465ae75a67584169acd;p=libvpx

Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
	vp8/encoder/bitstream.c

Change-Id: I44c00f98dcb99eb728ce4f5256aefb135a711a74
---

9dfd0060176ad0d6f5beb465ae75a67584169acd
diff --cc vp8/decoder/decodframe.c
index f69b09e21,a300bb5fd..4d02fdec4
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -619,8 -650,9 +650,8 @@@ int vp8_decode_frame(VP8D_COMP *pbi
      VP8_COMMON *const pc = & pbi->common;
      MACROBLOCKD *const xd  = & pbi->mb;
      const unsigned char *data = (const unsigned char *)pbi->Source;
-     const unsigned char *const data_end = data + pbi->source_sz;
+     const unsigned char *data_end = data + pbi->source_sz;
      ptrdiff_t first_partition_length_in_bytes;
 -
      int mb_row;
      int i, j, k, l;
      const int *const mb_feature_data_bits = vp8_mb_feature_data_bits;
diff --cc vp8/decoder/onyxd_int.h
index ec1701079,a8d1745dc..591fa4f23
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@@ -83,8 -83,10 +83,11 @@@ typedef struct VP8Decompresso
  
      const unsigned char *Source;
      unsigned int   source_sz;
+     const unsigned char *partitions[MAX_PARTITIONS];
+     unsigned int   partition_sizes[MAX_PARTITIONS];
+     unsigned int   num_partitions;
  
 +    unsigned char *segmentation_map;
  #if CONFIG_MULTITHREAD
      /* variable for threading */
  
diff --cc vp8/encoder/bitstream.c
index 4c4bb05bb,134e84881..e3c4b5f99
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@@ -17,12 -17,13 +17,15 @@@
  #include "vp8/common/systemdependent.h"
  #include <assert.h>
  #include <stdio.h>
+ #include <limits.h>
  #include "vp8/common/pragmas.h"
+ #include "vpx/vpx_encoder.h"
  #include "vpx_mem/vpx_mem.h"
  #include "bitstream.h"
+ #include "vp8/common/defaultcoefcounts.h"
 -
 +#if CONFIG_SEGMENTATION
 +static int segment_cost = 0;
 +#endif
  const int vp8cx_base_skip_false_prob[128] =
  {
      255, 255, 255, 255, 255, 255, 255, 255,