Merge "Fix two-pass framrate for Y4M input."
authorJohn Koleszar <jkoleszar@google.com>
Mon, 30 Aug 2010 19:40:37 +0000 (12:40 -0700)
committerCode Review <code-review@webmproject.org>
Mon, 30 Aug 2010 19:40:37 +0000 (12:40 -0700)

Trivial merge