[FFmpeg-cvslog] Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'

[Clément Bœsch]

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

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

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