Merge "Select prediction filter type in non-RD mode decision"

diff --cc vp9/encoder/vp9_encodeframe.c
index 7ef5438d6507b2349d5044bc0e3e5fd0fc115d1a,f03fb52e98cc4c63cb51f395bef0c97daa1467d0..fcea638cf60af01cd443d3a4603950d5c51d2419
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -3359,9 -3341,9 +3359,8 @@@ void vp9_encode_frame(VP9_COMP *cpi) 
        }
      }
    } else {
 -    cpi->mb.e_mbd.lossless = cpi->oxcf.lossless;
      cm->reference_mode = SINGLE_REFERENCE;
-     // Force the usage of the BILINEAR interp_filter.
-     cm->interp_filter = BILINEAR;
+     cm->interp_filter = SWITCHABLE;
      encode_frame_internal(cpi);
    }
  }