Merge "Fix comments for encoder controls"
authorYaowu Xu <yaowu@google.com>
Wed, 14 Jan 2015 23:32:35 +0000 (15:32 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 14 Jan 2015 23:32:35 +0000 (15:32 -0800)
1  2 
vpx/vp8cx.h

diff --cc vpx/vp8cx.h
Simple merge