Merge "vpxenc: remove some warnings w/--disable-(vp8|vp9)"
authorJames Zern <jzern@google.com>
Wed, 15 Jan 2014 22:21:22 +0000 (14:21 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 15 Jan 2014 22:21:22 +0000 (14:21 -0800)
1  2 
vpxenc.c

diff --cc vpxenc.c
Simple merge