From: Jingning Han <jingning@google.com>
Date: Wed, 9 Apr 2014 16:07:45 +0000 (-0700)
Subject: Merge "Select prediction filter type in non-RD mode decision"
X-Git-Tag: v1.4.0~1867
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae6485663a34dae40ce907463bcd268494b51bfd;p=libvpx

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

ae6485663a34dae40ce907463bcd268494b51bfd
diff --cc vp9/encoder/vp9_encodeframe.c
index 7ef5438d6,f03fb52e9..fcea638cf
--- a/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);
    }
  }