Merge "fix vp8-only build"
authorYaowu Xu <yaowu@google.com>
Thu, 19 Sep 2013 16:27:59 +0000 (09:27 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 19 Sep 2013 16:27:59 +0000 (09:27 -0700)
1  2 
vpxenc.c

diff --cc vpxenc.c
Simple merge