Merge commit '44aa9105c535471ca9e23796d7ca29b341f47636'

[ffmpeg] / libavcodec / mpegaudiodecheader.c

diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c
index ae86b087f3ee21d15d1c42923d1523b9ddeaf5d6..6cc79f18b566ebc0025f9a59800232a5407f67ba 100644 (file)
--- a/libavcodec/mpegaudiodecheader.c
+++ b/libavcodec/mpegaudiodecheader.c
@@ -152,15 +152,3 @@ int ff_mpa_decode_header(uint32_t head, int *sample_rate, int *channels, int *fr
     *bit_rate = s->bit_rate;
     return s->frame_size;
 }
-
-#if LIBAVCODEC_VERSION_MAJOR < 58
-int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate, enum AVCodecID *codec_id)
-{
-    return ff_mpa_decode_header(head, sample_rate, channels, frame_size, bit_rate, codec_id);
-}
-
-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(head, sample_rate, channels, frame_size, bit_rate, &avctx->codec_id);
-}
-#endif