]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '46278ec90ac5ad1dab5e85991f176afe49003fee'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:48:40 +0000 (10:48 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:48:40 +0000 (10:48 +0100)
* commit '46278ec90ac5ad1dab5e85991f176afe49003fee':
  mp3enc: write trailing padding

Noop, we have our own implementation for mp3 gapless.

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

Trivial merge