diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-10-17 15:15:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-17 15:15:10 -0700 |
| commit | c6f13f32784330350f176f453c8a4c2a9f6b90a6 (patch) | |
| tree | 98b17d6bfc0fcbc980a41b6f68375c667f118184 /vp8/common/entropy.h | |
| parent | eab804558bb7ff3fb503a1f9ccaf641d0dbc0120 (diff) | |
| parent | 47a2154c0e1130a247b7920b0a0c57ada212abc1 (diff) | |
| download | libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.gz libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.bz2 libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.zip | |
Merge changes Ic711a378,I43a46c36,If19ee74a into experimental
* changes:
Move remaining per-frame data into partition 0
Interleave modes/residual per macroblock
Force interleaved decoding
Diffstat (limited to 'vp8/common/entropy.h')
| -rw-r--r-- | vp8/common/entropy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 4af3ecf15..b9dfb344f 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -37,9 +37,9 @@ extern const int vp8_i8x8_block[4]; #define DCT_VAL_CATEGORY5 9 /* 35-66 Extra Bits 5+1 */ #define DCT_VAL_CATEGORY6 10 /* 67+ Extra Bits 13+1 */ #define DCT_EOB_TOKEN 11 /* EOB Extra Bits 0+0 */ - #define MAX_ENTROPY_TOKENS 12 #define ENTROPY_NODES 11 +#define EOSB_TOKEN 127 /* Not signalled, encoder only */ extern const vp8_tree_index vp8_coef_tree[]; |