From: John Koleszar <jkoleszar@google.com>
Date: Sat, 2 Mar 2013 04:50:33 +0000 (-0800)
Subject: Merge changes If5896507,I06b5ba5c,I2712f99e into experimental
X-Git-Tag: v1.3.0~1151^2~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d3e879fccef330d89f5e5ae6c718cb37d888d2a;p=libvpx

Merge changes If5896507,I06b5ba5c,I2712f99e into experimental

* changes:
  Add unit test for x4 multi-SAD functions
  Add VP9 1 block SAD functions to unit test
  Merge master branch into experimental
---

2d3e879fccef330d89f5e5ae6c718cb37d888d2a