]> granicus.if.org Git - libvpx/commit
Merge changes Idb8dd5f3,I7743611b
authorJames Zern <jzern@google.com>
Tue, 13 May 2014 18:43:38 +0000 (11:43 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 13 May 2014 18:43:38 +0000 (11:43 -0700)
commit2f34d284bbfde20f03bff150e69989e76606db4f
tree87a79ddff2b93f033f710d2bef0837d90cc12f46
parentfb67ce6899775887c56415fa1db81f1659c832ee
parentdba7376a9929fb945cfef2783c5aa9a5cf5086b1
Merge changes Idb8dd5f3,I7743611b

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