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)
commit59fced9e26950aa8c5e92bd5c98ca78ff8ab0230
tree28aa6754af9cc89e91393d1030dd7a4ce170524a
parent60e862c91f1d62df43579d0223b5ea7f13669da6
parentc26741332165a049717e6da84db13a24ee8edade
Merge commit 'c26741332165a049717e6da84db13a24ee8edade'

* 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>