[FFmpeg-cvslog] Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 13:21:06 2016 +0200| [93c75640c9ceaaba55e75e64c4e636817dbf6638] | committer: Clément Bœsch

Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'

* commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3':
  mmaldec: add vc1 decoding support

This commit is a noop, see b07cbf6724207ba768ebb2ccdee1b6749fd6ca31

Merged-by: Clément Bœsch <clement at stupeflix.com>

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