[FFmpeg-cvslog] Merge commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep 12 13:29:16 2015 +0200| [45ae2997858d408b140d0f785dbb0f09369b7367] | committer: Hendrik Leppkes

Merge commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6'

* commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6':
  mmaldec: fix problems with flush logic

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

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