Merge "Revert "Move input frame scaling into the recode loop""
authorPaul Wilkins <paulwilkins@google.com>
Thu, 16 Oct 2014 17:44:58 +0000 (10:44 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 16 Oct 2014 17:44:58 +0000 (10:44 -0700)

Trivial merge