Merge commit 'c26741332165a049717e6da84db13a24ee8edade'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:36:32 +0000 (13:36 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:36:32 +0000 (13:36 +0200)
* commit 'c26741332165a049717e6da84db13a24ee8edade':
  Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries

This commit is not merged as the previous one wasn't either.

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

Trivial merge