Merge remote branch 'origin/master' into experimental

Change-Id: I35c9ca116aecd0d03e762942d9cf1289edb4f23d

diff --cc vp8/common/entropy.c
Simple merge

diff --cc vp8/common/entropy.h
index 77f2673aadaac1ce607cf35fd9e564e8d28b654b,66d282b61e7b30bfe4c9bc276b9ded75902472c6..3c25453a7048542621b2445aa4a67ed578b51804
--- 1/vp8/common/entropy.h
--- 2/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[];

diff --cc vp8/common/onyxc_int.h
Simple merge

diff --cc vp8/encoder/firstpass.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/rdopt.c
Simple merge