From: James Zern <jzern@google.com>
Date: Tue, 13 May 2014 18:43:38 +0000 (-0700)
Subject: Merge changes Idb8dd5f3,I7743611b
X-Git-Tag: v1.4.0~1605
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f34d284bbfde20f03bff150e69989e76606db4f;p=platform%2Fupstream%2Flibvpx.git

Merge changes Idb8dd5f3,I7743611b

* changes:
  vpxenc: add some missing CONFIG_WEBM_IO checks
  vpxdec: add some missing CONFIG_WEBM_IO checks
---

2f34d284bbfde20f03bff150e69989e76606db4f