[FFmpeg-cvslog] Merge commit '46278ec90ac5ad1dab5e85991f176afe49003fee'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Nov 18 10:48:40 2016 +0100| [5e78126bbdd58ae4dd97e2b604cbbec336f8bc32] | committer: Hendrik Leppkes

Merge commit '46278ec90ac5ad1dab5e85991f176afe49003fee'

* commit '46278ec90ac5ad1dab5e85991f176afe49003fee':
  mp3enc: write trailing padding

Noop, we have our own implementation for mp3 gapless.

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

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