Merge commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:29:16 +0000 (13:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:29:16 +0000 (13:29 +0200)
* commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6':
  mmaldec: fix problems with flush logic

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge