[FFmpeg-cvslog] Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'

[Clément Bœsch]

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

Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'

* commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1':
  mmaldec: Use av_assert0() instead of assert()

This commit is a noop, see c0152ebb9e0501b9d3d4386531995683a4ac824c

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

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