Merge "Fix block size computation in coeff token packing" into nextgenv2

2015-11-03 00:28:15 +00:00
parent 51c357083c 4b0ef55f10
commit 506e3b136c
1 changed files with 1 additions and 1 deletions
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -326,7 +326,7 @@ static void pack_mb_tokens(vpx_writer *w,
  TOKENEXTRA *p = *tp;
 #if CONFIG_VAR_TX
  int count = 0;
-  const int seg_eob = 16 << (1 << tx);
+  const int seg_eob = 16 << (tx << 1);
 #endif
 #if !CONFIG_MISC_FIXES
  (void) tx;