From: Adrian Grange <agrange@google.com>
Date: Mon, 5 May 2014 22:41:10 +0000 (-0700)
Subject: Merge changes Ibfa447fe,I771809ba
X-Git-Tag: v1.4.0~1669
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b4efa493a242b2d067b7523cf6bf7e4ba62e627;p=libvpx

Merge changes Ibfa447fe,I771809ba

* changes:
  Fix generic-gnu target build
  Fix rounding in ARNR calculation
---

6b4efa493a242b2d067b7523cf6bf7e4ba62e627