summaryrefslogtreecommitdiff
path: root/vp8/decoder/onyxd_int.h
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-06-29 00:05:09 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-06-29 00:05:10 -0400
commitfe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a (patch)
tree7f37a3098b214edc8a870a1180bbca69753d2640 /vp8/decoder/onyxd_int.h
parentd83b68c62296eee867bdd6b5fd299ad1706e624a (diff)
parentdc004e8c17a1f330ed46eab092ca67e6f785fee1 (diff)
downloadlibvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar.gz
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar.bz2
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I68e604e4a731f6703fdec7eff2c2c9b9e36879ea
Diffstat (limited to 'vp8/decoder/onyxd_int.h')
-rw-r--r--vp8/decoder/onyxd_int.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h
index 3fa0cfab6..a8d1745dc 100644
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -83,6 +83,9 @@ typedef struct VP8Decompressor
const unsigned char *Source;
unsigned int source_sz;
+ const unsigned char *partitions[MAX_PARTITIONS];
+ unsigned int partition_sizes[MAX_PARTITIONS];
+ unsigned int num_partitions;
#if CONFIG_MULTITHREAD
/* variable for threading */
@@ -137,6 +140,7 @@ typedef struct VP8Decompressor
unsigned int mvs_corrupt_from_mb;
#endif
int ec_enabled;
+ int input_partition;
} VP8D_COMP;