Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:04:40 +0000 (13:04 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:04:40 +0000 (13:04 +0200)
commitb5f9f16582d9785ed6659d6bf8777cd004908cc2
treec7935a49e278d54c782d394617f40808791fae05
parent5605c1b3c02550b2acf014ecfbea73c728d25379
parent366ba2dee1f2b17825b42e2164d3b9879f0271b1
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@stupeflix.com>