Merge "Fix segv without --enable-error-concealment"
authorJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 17:58:24 +0000 (10:58 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 19 May 2011 17:58:24 +0000 (10:58 -0700)

Trivial merge