Merge "Superblock coding." into experimental

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

diff --cc vp8/decoder/decodframe.c
index 4b3d36956ae75b76bd004c81b1f064901d92b6dd,61d3c8d2c4989ab36f70412a5a5d5a5a27cf7a43..1ec4cb17a945f798a4fb4da6e6f03c5b1aa33612
--- 1/vp8/decoder/decodframe.c
--- 2/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -209,16 -229,16 +229,20 @@@ static void decode_macroblock(VP8D_COM
    MB_PREDICTION_MODE mode;
    int i;
    int tx_type;
+ #if CONFIG_SUPERBLOCKS
+   VP8_COMMON *pc = &pbi->common;
+   int orig_skip_flag = xd->mode_info_context->mbmi.mb_skip_coeff;
+ #endif
  
  #if CONFIG_HYBRIDTRANSFORM
 -  int QIndex = xd->q_index;
 -  int active_ht = (QIndex < ACTIVE_HT);
 +  int QIndex;
 +  int active_ht;
  #endif
  
 +  // re-initialize macroblock dequantizer before detokenization
 +  if (xd->segmentation_enabled)
 +    mb_init_dequantizer(pbi, xd);
 +
    if (pbi->common.frame_type == KEY_FRAME) {
  #if CONFIG_TX16X16
      if (xd->mode_info_context->mbmi.mode <= TM_PRED ||

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

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

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

diff --cc vp8/encoder/variance.h
Simple merge