From: James Zern <jzern@google.com>
Date: Sat, 30 Jan 2016 00:17:16 +0000 (+0000)
Subject: Merge changes If13946e4,I61a1814d,I2ca9aa3c,I44d91eaa
X-Git-Tag: v1.6.0~400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8faccb709a8402d68993e4a50b2e7b797c7bf3e8;p=libvpx

Merge changes If13946e4,I61a1814d,I2ca9aa3c,I44d91eaa

* changes:
  intrapred: protect functions w/CONFIG check
  vp9_noise_estimate: protect copy_frame w/CONFIG check
  vp8_cx_iface: delete 3 unused functions
  vp8: mark intra_prediction_down_copy inline
---

8faccb709a8402d68993e4a50b2e7b797c7bf3e8