]> granicus.if.org Git - libvpx/commitdiff
Merge "Pass AV1_COMMON into get_scan" into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 21 Oct 2016 21:51:50 +0000 (21:51 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 21 Oct 2016 21:51:50 +0000 (21:51 +0000)
1  2 
av1/decoder/decodeframe.c
av1/encoder/encodeframe.c

index 146ca237ee2eba92dc0b673e3835cde47a376f8d,bbd788b901a276d25535e74b706d21a8ccef3fbc..2e6e74403312d00ea4b55ff055e6e8341ed2b299
@@@ -1357,10 -1370,13 +1359,10 @@@ static void decode_block(AV1Decoder *co
  
          for (row = 0; row < max_blocks_high; row += stepr)
            for (col = 0; col < max_blocks_wide; col += stepc)
-             eobtotal += reconstruct_inter_block(xd, r, mbmi->segment_id, plane,
-                                                 row, col, tx_size);
+             eobtotal += reconstruct_inter_block(cm, xd, r, mbmi->segment_id,
+                                                 plane, row, col, tx_size);
  #endif
        }
 -
 -      if (!less8x8 && eobtotal == 0)
 -        mbmi->has_no_coeffs = 1;  // skip loopfilter
      }
    }
  
Simple merge