Merge commit '72d658766e6ccf198317dffd6499c5e288847a1c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:57:40 +0000 (16:57 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:57:40 +0000 (16:57 +0100)
commita78d9abee0dfef2dc86e711e27b474e7d07dca2e
tree341560b9446ee0a9813b5b32028c153d3fa8c984
parent42ff56e362e823f5292c0d661fd35778da2d7eef
parent72d658766e6ccf198317dffd6499c5e288847a1c
Merge commit '72d658766e6ccf198317dffd6499c5e288847a1c'

* commit '72d658766e6ccf198317dffd6499c5e288847a1c':
  mp3dec: replace avpriv_mpa_decode_header with avpriv_mpegaudio_decode_header

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