Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:36:07 +0000 (13:36 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:36:07 +0000 (13:36 +0200)
commit60e862c91f1d62df43579d0223b5ea7f13669da6
tree28aa6754af9cc89e91393d1030dd7a4ce170524a
parentd16aefee5cf378021a0951bc0542ace90aef2b9d
parent33ac77e850efdfd0e8835950c3d947baffd4df45
Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'

* commit '33ac77e850efdfd0e8835950c3d947baffd4df45':
  mmaldec: autodetect by default

This commit is not merged (it will be reverted in the next one to
merge).

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