Merge "Finally removing all old block size constants."

diff --cc vp9/decoder/vp9_decodemv.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
index 1be30ea6b87ef4a0a1a6e1aae93ad2f52790f4bc,4b74bc8360f0989feee2f5f22930e9642f3ee499..8bd35008f30996b20f085833b0c93ecafb1878f0
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -1923,11 -1922,10 +1923,11 @@@ static void encode_sb_row(VP9_COMP *cpi
        MODE_INFO *m = cm->mi + idx_str;
        MODE_INFO *p = cm->prev_mi + idx_str;
  
 +      cpi->mb.source_variance = UINT_MAX;
        if (cpi->sf.use_one_partition_size_always) {
-         set_offsets(cpi, mi_row, mi_col, BLOCK_SIZE_SB64X64);
+         set_offsets(cpi, mi_row, mi_col, BLOCK_64X64);
          set_partitioning(cpi, m, cpi->sf.always_this_block_size);
-         rd_use_partition(cpi, m, tp, mi_row, mi_col, BLOCK_SIZE_SB64X64,
+         rd_use_partition(cpi, m, tp, mi_row, mi_col, BLOCK_64X64,
                           &dummy_rate, &dummy_dist, 1);
        } else if (cpi->sf.partition_by_variance) {
          choose_partitioning(cpi, cm->mi, mi_row, mi_col);

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge