diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 17:05:37 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 17:05:37 +0100 |
| commit | 92fe2adc1b2ba618dac5adf38557e09b534b2086 (patch) | |
| tree | 7abcf5eaf8c16e6bb91487d3c6db85a8009f661b /libavcodec/mpegaudio_parser.c | |
| parent | a78d9abee0dfef2dc86e711e27b474e7d07dca2e (diff) | |
| parent | de9e199a039473ebe4b1b87382e3064d0ea2cf02 (diff) | |
Merge commit 'de9e199a039473ebe4b1b87382e3064d0ea2cf02'
* commit 'de9e199a039473ebe4b1b87382e3064d0ea2cf02':
lavc: make avpriv_mpa_decode_header private on next bump
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpegaudio_parser.c')
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 4c72131bd4..873f941237 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -69,7 +69,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, state= (state<<8) + buf[i++]; - ret = avpriv_mpa_decode_header2(state, &sr, &channels, &frame_size, &bit_rate, &codec_id); + ret = ff_mpa_decode_header(state, &sr, &channels, &frame_size, &bit_rate, &codec_id); if (ret < 4) { if (i > 4) s->header_count = -2; |