Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/common/entropy.c

Change-Id: I35fd49cf92a50d09082fe199d3bf21bfca68a94f

diff --cc vp8/common/entropy.c
index 153dd002000b9f4d13f28c3f059177ec58773cbc,a1fe4f4ab97aaff6b731942775d224d6ac2189ef..21948328977ebe3c3bdf4f625b1929488e024c38
--- 1/vp8/common/entropy.c
--- 2/vp8/common/entropy.c
+++ b/vp8/common/entropy.c
@@@ -111,26 -111,23 +111,23 @@@ static void init_bit_trees(
      init_bit_tree(cat3, 3);
      init_bit_tree(cat4, 4);
      init_bit_tree(cat5, 5);
 -    init_bit_tree(cat6, 11);
 +    init_bit_tree(cat6, 13);
  }
  
- 
- static vp8bc_index_t bcc1[1], bcc2[2], bcc3[3], bcc4[4], bcc5[5], bcc6[11];
- 
  vp8_extra_bit_struct vp8_extra_bits[12] =
  {
-     { 0, 0, 0, 0, 0},
-     { 0, 0, 0, 0, 1},
-     { 0, 0, 0, 0, 2},
-     { 0, 0, 0, 0, 3},
-     { 0, 0, 0, 0, 4},
-     { cat1, Pcat1, bcc1, 1, 5},
-     { cat2, Pcat2, bcc2, 2, 7},
-     { cat3, Pcat3, bcc3, 3, 11},
-     { cat4, Pcat4, bcc4, 4, 19},
-     { cat5, Pcat5, bcc5, 5, 35},
-     { cat6, Pcat6, bcc6, 13, 67},
-     { 0, 0, 0, 0, 0}
+     { 0, 0, 0, 0},
+     { 0, 0, 0, 1},
+     { 0, 0, 0, 2},
+     { 0, 0, 0, 3},
+     { 0, 0, 0, 4},
+     { cat1, Pcat1, 1, 5},
+     { cat2, Pcat2, 2, 7},
+     { cat3, Pcat3, 3, 11},
+     { cat4, Pcat4, 4, 19},
+     { cat5, Pcat5, 5, 35},
 -    { cat6, Pcat6, 11, 67},
++    { cat6, Pcat6, 13, 67},
+     { 0, 0, 0, 0}
  };
  #include "defaultcoefcounts.h"
  

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