aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-02 19:16:21 +0100
committerAnton Khirnov <anton@khirnov.net>2015-12-12 21:26:29 +0100
commitde9e199a039473ebe4b1b87382e3064d0ea2cf02 (patch)
tree958c64b7b43b94eea57c1bba6c991ef6c0f524e7
parent72d658766e6ccf198317dffd6499c5e288847a1c (diff)
downloadffmpeg-de9e199a039473ebe4b1b87382e3064d0ea2cf02.tar.gz
lavc: make avpriv_mpa_decode_header private on next bump
It's not used by anything outside of lavc anymore.
-rw-r--r--libavcodec/mpegaudio_parser.c2
-rw-r--r--libavcodec/mpegaudiodecheader.c10
-rw-r--r--libavcodec/mpegaudiodecheader.h5
3 files changed, 15 insertions, 2 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 84c20d882f..c44c02417c 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -67,7 +67,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
state= (state<<8) + buf[i++];
- ret = avpriv_mpa_decode_header(avctx, state, &sr, &channels, &frame_size, &bit_rate);
+ ret = ff_mpa_decode_header(avctx, state, &sr, &channels, &frame_size, &bit_rate);
if (ret < 4) {
if (i > 4)
s->header_count = -2;
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c
index 175f8c2ca7..7e5bae87c4 100644
--- a/libavcodec/mpegaudiodecheader.c
+++ b/libavcodec/mpegaudiodecheader.c
@@ -118,7 +118,8 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header)
return 0;
}
-int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate)
+int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate,
+ int *channels, int *frame_size, int *bit_rate)
{
MPADecodeHeader s1, *s = &s1;
@@ -151,3 +152,10 @@ int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_r
*bit_rate = s->bit_rate;
return s->frame_size;
}
+
+#if LIBAVCODEC_VERSION_MAJOR < 57
+int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate)
+{
+ return ff_mpa_decode_header(avctx, head, sample_rate, channels, frame_size, bit_rate);
+}
+#endif
diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h
index 764e8abde4..df829c14d6 100644
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@@ -54,7 +54,12 @@ 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 ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate,
+ int *channels, int *frame_size, int *bitrate);
+
+#if LIBAVCODEC_VERSION_MAJOR < 57
int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate);
+#endif
/* fast header check for resync */
static inline int ff_mpa_check_header(uint32_t header){