[FFmpeg-cvslog] Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 18:23:36 2016 +0000| [ef7ce480c848267a77bd89666b9b22b2298c181d] | committer: Derek Buitenhuis

Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'

* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
  build: Disentangle VC-1 decoder and parser

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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