From: John Koleszar <jkoleszar@google.com>
Date: Thu, 30 Jun 2011 04:05:10 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~425
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6251e9e5cee546c3b20cdc3498d43e0204db97b9;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: I35c9ca116aecd0d03e762942d9cf1289edb4f23d
---

6251e9e5cee546c3b20cdc3498d43e0204db97b9
diff --cc vp8/common/entropy.h
index 77f2673aa,66d282b61..3c25453a7
--- a/vp8/common/entropy.h
+++ b/vp8/common/entropy.h
@@@ -27,11 -27,10 +27,10 @@@
  #define DCT_VAL_CATEGORY3       7       /* 11-18     Extra Bits 3+1 */
  #define DCT_VAL_CATEGORY4       8       /* 19-34     Extra Bits 4+1 */
  #define DCT_VAL_CATEGORY5       9       /* 35-66     Extra Bits 5+1 */
 -#define DCT_VAL_CATEGORY6       10      /* 67+       Extra Bits 11+1 */
 +#define DCT_VAL_CATEGORY6       10      /* 67+       Extra Bits 13+1 */
  #define DCT_EOB_TOKEN           11      /* EOB       Extra Bits 0+0 */
  
- #define vp8_coef_tokens 12
- #define MAX_ENTROPY_TOKENS vp8_coef_tokens
+ #define MAX_ENTROPY_TOKENS 12
  #define ENTROPY_NODES 11
  
  extern const vp8_tree_index vp8_coef_tree[];