[FFmpeg-cvslog] Merge commit 'c26741332165a049717e6da84db13a24ee8edade'

[Clément Bœsch]

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

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 at stupeflix.com>

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