Merge "vpxenc: support scaling prior to encoding" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 27 Feb 2013 18:59:21 +0000 (10:59 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 27 Feb 2013 18:59:21 +0000 (10:59 -0800)

Trivial merge