]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:48:04 +0000 (10:48 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:48:04 +0000 (10:48 +0100)
* commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3':
  mp3dec: read the initial/trailing padding from the LAME tag

Noop, we have our own implementation for mp3 gapless tags.

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

Trivial merge