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)
commit29e1247d41324a0a8317c5f6018c015430c2d3f2
treee659b22bc2bc75fe1168bbf351e89e5c8b3da072
parent91b4d109175e1d729a649332a9c348e09eaf56bb
parent2e1ab6a67dd5d9a30558d008aa6e541c68d76221
Merge commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221'

* 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>