From: Aℓex Converse <aconverse@google.com>
Date: Fri, 31 Jul 2015 19:05:54 +0000 (+0000)
Subject: Merge changes Ic1ce346a,Ic0b4e92c
X-Git-Tag: v1.5.0~357
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90e563d91f4984b26e1d8d3db4f59a3198f2fecb;p=platform%2Fupstream%2Flibvpx.git

Merge changes Ic1ce346a,Ic0b4e92c

* changes:
  Simplify model_rd_for_sb HBD ifdefs
  Simplify dist_block HBD ifdefs
---

90e563d91f4984b26e1d8d3db4f59a3198f2fecb