diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-30 08:46:49 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-30 08:46:49 -0400 |
| commit | 9dfd0060176ad0d6f5beb465ae75a67584169acd (patch) | |
| tree | 8bbbefd2c75c36c26721f20b988ab86e0f1aa80e /vp8/decoder/onyxd_int.h | |
| parent | f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839 (diff) | |
| parent | 6251e9e5cee546c3b20cdc3498d43e0204db97b9 (diff) | |
| download | libvpx-9dfd0060176ad0d6f5beb465ae75a67584169acd.tar libvpx-9dfd0060176ad0d6f5beb465ae75a67584169acd.tar.gz libvpx-9dfd0060176ad0d6f5beb465ae75a67584169acd.tar.bz2 libvpx-9dfd0060176ad0d6f5beb465ae75a67584169acd.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/encoder/bitstream.c
Change-Id: I44c00f98dcb99eb728ce4f5256aefb135a711a74
Diffstat (limited to 'vp8/decoder/onyxd_int.h')
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index ec1701079..591fa4f23 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; unsigned char *segmentation_map; #if CONFIG_MULTITHREAD @@ -137,6 +140,7 @@ typedef struct VP8Decompressor unsigned int mvs_corrupt_from_mb; #endif int ec_enabled; + int input_partition; } VP8D_COMP; |