Merge "Disable error concealment until first key frame is decoded"
authorJohn Koleszar <jkoleszar@google.com>
Fri, 12 Aug 2011 18:45:26 +0000 (11:45 -0700)
committerCode Review <code-review@webmproject.org>
Fri, 12 Aug 2011 18:45:26 +0000 (11:45 -0700)

Trivial merge