From: James Zern <jzern@google.com>
Date: Tue, 19 Aug 2014 22:16:29 +0000 (-0700)
Subject: Merge changes I13d975d1,I26710359
X-Git-Tag: v1.4.0~980
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b0faffcf850b26a6003ac14c62728c2b2f8878b;p=libvpx

Merge changes I13d975d1,I26710359

* changes:
  vpxenc: fix compile with --disable-libyuv
  vpxdec: fix compile with --disable-libyuv
---

7b0faffcf850b26a6003ac14c62728c2b2f8878b