]> granicus.if.org Git - libvpx/commitdiff
Merge changes I13d975d1,I26710359
authorJames Zern <jzern@google.com>
Tue, 19 Aug 2014 22:16:29 +0000 (15:16 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 19 Aug 2014 22:16:29 +0000 (15:16 -0700)
* changes:
  vpxenc: fix compile with --disable-libyuv
  vpxdec: fix compile with --disable-libyuv

1  2 
vpxdec.c

diff --cc vpxdec.c
Simple merge