diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-26 10:22:42 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-26 10:22:42 -0400 |
| commit | 62400028e22b3544eac09724afe45f3cd55766a1 (patch) | |
| tree | 8b9da3086125517a9e93ed2c3370d49b0e3cf8b8 /vp8/decoder/onyxd_int.h | |
| parent | 96513c42b2e34ea096edd9eb649120362c71836f (diff) | |
| parent | ca7e346669ce7d9a410edc19a828f9ca9637626d (diff) | |
| download | libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar.gz libvpx-62400028e22b3544eac09724afe45f3cd55766a1.tar.bz2 libvpx-62400028e22b3544eac09724afe45f3cd55766a1.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/decoder/detokenize.c
vp8/decoder/onyxd_int.h
Change-Id: Ib9b516b939358ac8bf694200a8425fdd62c8d149
Diffstat (limited to 'vp8/decoder/onyxd_int.h')
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 6309915ab..bb05ea826 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -44,21 +44,6 @@ typedef struct int size; } DATARATE; -#if CONFIG_EXTEND_QRANGE -typedef struct -{ - INT16 min_val; - INT16 Length; - UINT8 Probs[14]; -} TOKENEXTRABITS; -#else -typedef struct -{ - INT16 min_val; - INT16 Length; - UINT8 Probs[12]; -} TOKENEXTRABITS; -#endif typedef struct { int const *scan; @@ -67,7 +52,6 @@ typedef struct #endif UINT8 const *ptr_block2leftabove; vp8_tree_index const *vp8_coef_tree_ptr; - TOKENEXTRABITS const *teb_base_ptr; unsigned char *norm_ptr; UINT8 *ptr_coef_bands_x; #if CONFIG_T8X8 |