diff options
Diffstat (limited to 'vp8/common/entropy.c')
| -rw-r--r-- | vp8/common/entropy.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 67242d5ea..90f7a52c2 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -97,7 +97,6 @@ DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]) = { 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63, }; -#if CONFIG_TX16X16 || CONFIG_HYBRIDTRANSFORM16X16 // Table can be optimized. DECLARE_ALIGNED(16, const int, vp8_coef_bands_16x16[256]) = { 0, 1, 2, 3, 5, 4, 4, 5, 5, 3, 6, 3, 5, 4, 6, 6, @@ -135,7 +134,6 @@ DECLARE_ALIGNED(16, const int, vp8_default_zig_zag1d_16x16[256]) = { 203, 218, 233, 248, 249, 234, 219, 204, 189, 174, 159, 175, 190, 205, 220, 235, 250, 251, 236, 221, 206, 191, 207, 222, 237, 252, 253, 238, 223, 239, 254, 255, }; -#endif /* Array indices are identical to previously-existing CONTEXT_NODE indices */ @@ -222,7 +220,6 @@ void vp8_default_coef_probs(VP8_COMMON *pc) { sizeof(pc->fc.hybrid_coef_probs_8x8)); #endif -#if CONFIG_TX16X16 vpx_memcpy(pc->fc.coef_probs_16x16, default_coef_probs_16x16, sizeof(pc->fc.coef_probs_16x16)); #if CONFIG_HYBRIDTRANSFORM16X16 @@ -230,7 +227,6 @@ void vp8_default_coef_probs(VP8_COMMON *pc) { default_hybrid_coef_probs_16x16, sizeof(pc->fc.hybrid_coef_probs_16x16)); #endif -#endif } void vp8_coef_tree_initialize() { @@ -419,7 +415,6 @@ void vp8_adapt_coef_probs(VP8_COMMON *cm) { } #endif -#if CONFIG_TX16X16 for (i = 0; i < BLOCK_TYPES_16X16; ++i) for (j = 0; j < COEF_BANDS; ++j) for (k = 0; k < PREV_COEF_CONTEXTS; ++k) { @@ -464,5 +459,4 @@ void vp8_adapt_coef_probs(VP8_COMMON *cm) { } } #endif -#endif } |