Merge commit 'de9e199a039473ebe4b1b87382e3064d0ea2cf02'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:05:37 +0000 (17:05 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:05:37 +0000 (17:05 +0100)
commit92fe2adc1b2ba618dac5adf38557e09b534b2086
tree7abcf5eaf8c16e6bb91487d3c6db85a8009f661b
parenta78d9abee0dfef2dc86e711e27b474e7d07dca2e
parentde9e199a039473ebe4b1b87382e3064d0ea2cf02
Merge commit 'de9e199a039473ebe4b1b87382e3064d0ea2cf02'

* commit 'de9e199a039473ebe4b1b87382e3064d0ea2cf02':
  lavc: make avpriv_mpa_decode_header private on next bump

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