Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:31:53 +0000 (14:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:31:53 +0000 (14:31 +0200)
commit314e6086315dafc2008839238b0d7b053ce009c4
treeb16bd95f07274e0c2b549949210a27a2f7431466
parente2836397f11c87573f7cb7f75319a7db248e59ac
parent74b1bf632f125a795e66e5fd0a060b9c7c55b7a3
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'

* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
  mp3: Make the extrasize explicit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/mpegaudiodec_template.c