Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:47:27 +0000 (16:47 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:47:27 +0000 (16:47 +0100)
commit1e96b151fa6e9931c626283b7dfc15e4ec0095aa
treed446814f822f9a3125c1b60414e1f9c68b6bdb64
parent15c60c8af2271cd7d5c6c6ce7f8f127a32f18cfd
parent955aec3c7c7be39b659197e1ec379a09f2b7c41c
Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'

* commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c':
  mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libmp3lame.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegaudiodecheader.c
libavformat/mp3dec.c
libavformat/mp3enc.c