Merge "Refactoring of switchable filter search for speed" into experimental

diff --cc vp9/encoder/vp9_rdopt.c
index ec157961af8bce2323ceb8b0e9012fed875941f4,bfa4a81cace3687c3b561cca8a155631bda5f6c3..14b9a13db98fb12948586b617d00fcebb1551b92
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -3318,9 -3777,9 +3686,9 @@@ static int64_t handle_inter_mode(VP9_CO
      }
  
      if ((int)sse < threshold) {
 -      unsigned int q2dc = xd->block[24].dequant[0];
 +      unsigned int q2dc = xd->block[0].dequant[0];
        /* If there is no codeable 2nd order dc
-        or a very small uniform pixel change change */
+          or a very small uniform pixel change change */
        if ((sse - var < q2dc * q2dc >> 4) ||
            (sse / 2 > var && sse - var < 64)) {
          // Check u and v to make sure skip is ok