Merge "Cleaning up vp9_entropy.h file."

diff --cc vp9/common/vp9_blockd.h
Simple merge

diff --cc vp9/common/vp9_entropy.c
Simple merge

diff --cc vp9/common/vp9_entropy.h
Simple merge

diff --cc vp9/decoder/vp9_detokenize.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_block.h
Simple merge

diff --cc vp9/encoder/vp9_encodemb.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index 3402d6302e305f5e17173ed1f4595d49d5614094,5feca235d75ab5094cfe64187b8d2b08969fbc43..71a3650fef1c143e3308a355941bf5b3d9667132
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/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;

diff --cc vp9/encoder/vp9_tokenize.c
Simple merge

diff --cc vp9/encoder/vp9_tokenize.h
Simple merge