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/mpegaudiodecheader.h | |
| parent | a78d9abee0dfef2dc86e711e27b474e7d07dca2e (diff) | |
| parent | de9e199a039473ebe4b1b87382e3064d0ea2cf02 (diff) | |
| download | ffmpeg-streaming-92fe2adc1b2ba618dac5adf38557e09b534b2086.zip ffmpeg-streaming-92fe2adc1b2ba618dac5adf38557e09b534b2086.tar.gz | |
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/mpegaudiodecheader.h')
| -rw-r--r-- | libavcodec/mpegaudiodecheader.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h index 444b85f..55d5a15 100644 --- a/libavcodec/mpegaudiodecheader.h +++ b/libavcodec/mpegaudiodecheader.h @@ -54,9 +54,13 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header); /* useful helper to get mpeg audio stream infos. Return -1 if error in header, otherwise the coded frame size in bytes */ -int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate); +int ff_mpa_decode_header(uint32_t head, int *sample_rate, + int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id); +#if LIBAVCODEC_VERSION_MAJOR < 58 +int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate); int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id); +#endif /* fast header check for resync */ static inline int ff_mpa_check_header(uint32_t header){ |
