[FFmpeg-cvslog] Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'

[Clément Bœsch]

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

Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'

* commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
  mmaldec: correct package buffering accounting

This commit is a noop, see a55fbfa4c4967068a9c37f041110ace9fb633d4e

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

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