From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 5 Dec 2013 00:46:41 +0000 (-0800)
Subject: Merge "Cleaning up vp9_entropy.h file."
X-Git-Tag: v1.4.0~2905
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3712b58c2f49d232eac87b481cd2a1f425505336;p=libvpx

Merge "Cleaning up vp9_entropy.h file."
---

3712b58c2f49d232eac87b481cd2a1f425505336
diff --cc vp9/encoder/vp9_rdopt.c
index 3402d6302,5feca235d..71a3650fe
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -525,10 -525,10 +525,10 @@@ static INLINE int cost_coeffs(MACROBLOC
    struct macroblockd_plane *pd = &xd->plane[plane];
    const PLANE_TYPE type = pd->plane_type;
    const int16_t *band_count = &band_counts[tx_size][1];
 -  const int eob = pd->eobs[block];
 +  const int eob = p->eobs[block];
    const int16_t *const qcoeff_ptr = BLOCK_OFFSET(p->qcoeff, block);
    const int ref = mbmi->ref_frame[0] != INTRA_FRAME;
-   unsigned int (*token_costs)[2][PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS] =
+   unsigned int (*token_costs)[2][PREV_COEF_CONTEXTS][ENTROPY_TOKENS] =
                     x->token_costs[tx_size][type][ref];
    const ENTROPY_CONTEXT above_ec = !!*A, left_ec = !!*L;
    uint8_t *p_tok = x->token_cache;