]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:50 +0000 (13:21 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:50 +0000 (13:21 +0200)
* commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
  mmaldec: correct package buffering accounting

This commit is a noop, see a55fbfa4c4967068a9c37f041110ace9fb633d4e

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

Trivial merge