From: James Zern <jzern@google.com>
Date: Wed, 10 Jun 2015 19:18:03 +0000 (+0000)
Subject: Merge changes I89a8440f,Ifa3926e1
X-Git-Tag: v1.5.0~584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ded624ff33d1696d43b87d62745b718887cf2c1;p=libvpx

Merge changes I89a8440f,Ifa3926e1

* changes:
  libs.mk: relocate TEST_INTRA_PRED_SPEED_OBJS init
  test_intra_pred_speed: remove #if w/in another macro
---

4ded624ff33d1696d43b87d62745b718887cf2c1