Merge "bugfix: all vpxenc arguments were not parsed under all conditions"
authorJohn Koleszar <jkoleszar@google.com>
Tue, 29 Nov 2011 16:54:31 +0000 (08:54 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 29 Nov 2011 16:54:31 +0000 (08:54 -0800)

Trivial merge