[FFmpeg-cvslog] Merge commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 13:29:09 2017 -0300| [29e1247d41324a0a8317c5f6018c015430c2d3f2] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29e1247d41324a0a8317c5f6018c015430c2d3f2
---