From: James Zern <jzern@google.com>
Date: Fri, 20 Mar 2015 06:33:53 +0000 (-0700)
Subject: Merge changes I42fa121b,Id30076ce
X-Git-Tag: v1.4.0~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748a4fd638f1241b20bfca55cf857447e5e4425d;p=libvpx

Merge changes I42fa121b,Id30076ce

* changes:
  vpx/vpx_codec.h: bump ABI version
  vpx/vpx_encoder.h: bump ABI version
---

748a4fd638f1241b20bfca55cf857447e5e4425d