Merge commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 16:29:09 +0000 (13:29 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 16:29:51 +0000 (13:29 -0300)
* commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221':
  vc1dec: raise an error if sprite picture data is missing

This commit is a noop, see 30f680ee0a2707af9a649a0aa3fd951d18a25c05

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge