Merge "vpxenc: fix per-frame psnr/size output on a terminal"
authorJames Zern <jzern@google.com>
Fri, 11 Jul 2014 22:53:05 +0000 (15:53 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 11 Jul 2014 22:53:05 +0000 (15:53 -0700)

Trivial merge