Merge "Enable fast forward txfm and quant for rate-distortion search"

diff --cc vp9/encoder/vp9_block.h
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index 5caafd37022858068364333c5bb0d8b3ab5b9bf0,35ba85d747e95bb998d3a73f8e017457d7ef21b4..cc55dd78f122b10f8ce179db74ac4ecdf1cc98ec
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -2313,9 -2350,12 +2349,12 @@@ static int64_t handle_inter_mode(VP9_CO
    if (!is_comp_pred) {
      if (cpi->allow_encode_breakout)
        rd_encode_breakout_test(cpi, x, bsize, rate2, distortion, distortion_uv,
 -                              disable_skip, this_rd);
 +                              disable_skip);
    }
  
+   vpx_memcpy(x->skip_txfm, skip_txfm, sizeof(skip_txfm));
+   vpx_memcpy(x->bsse, bsse, sizeof(bsse));
+ 
    if (!x->skip) {
      int skippable_y, skippable_uv;
      int64_t sseuv = INT64_MAX;