Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/decoder/decodframe.c
index cbbcd20f5fee69c854c5db466782b81a5652addc,4cd370afedbfb49119539ecd16779a41a6bdc765..0f4b47463a6d39e30ed6d7fca2c4c769844f139c
--- 1/vp8/decoder/decodframe.c
--- 2/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -215,30 -191,9 +215,30 @@@ static void decode_macroblock(VP8D_COM
      {
          vp8_reset_mb_tokens_context(xd);
      }
-     else
+     else if (!vp8dx_bool_error(xd->current_bc))
      {
 -        eobtotal = vp8_decode_mb_tokens(pbi, xd);
 +
 +#if CONFIG_T8X8
 +        for(i = 0; i < 25; i++)
 +        {
 +            xd->block[i].eob = 0;
 +            xd->eobs[i] = 0;
 +        }
 +        if (xd->mode_info_context->mbmi.segment_id >= 2)
 +            eobtotal = vp8_decode_mb_tokens_8x8(pbi, xd);
 +        else
 +#endif
 +            eobtotal = vp8_decode_mb_tokens(pbi, xd);
 +#ifdef DEC_DEBUG
 +        if (dec_debug) {
 +            printf("\nTokens (%d)\n", eobtotal);
 +            for (i =0; i<400; i++) {
 +                printf("%3d ", xd->qcoeff[i]);
 +                if (i%16 == 15) printf("\n");
 +            }
 +            printf("\n");
 +        }
 +#endif
      }
  
      /* Perform temporary clamping of the MV to be used for prediction */

diff --cc vp8/decoder/onyxd_if.c
Simple merge

diff --cc vp8/decoder/threading.c
Simple merge