Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:06 +0000 (13:21 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:06 +0000 (13:21 +0200)
commit93c75640c9ceaaba55e75e64c4e636817dbf6638
treec7935a49e278d54c782d394617f40808791fae05
parentc824c3c47ca656b332f08b9e2b06d1ff61af1141
parent9a382f363950c0aab1500aa0937f73bf4dde9ee3
Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'

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

This commit is a noop, see b07cbf6724207ba768ebb2ccdee1b6749fd6ca31

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