avcodec/mpegaudiodecheader: remove dead code
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 04:39:47 +0000 (01:39 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 04:39:47 +0000 (01:39 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/mpegaudiodecheader.c
libavcodec/mpegaudiodecheader.h

index ae86b087f3ee21d15d1c42923d1523b9ddeaf5d6..6cc79f18b566ebc0025f9a59800232a5407f67ba 100644 (file)
@@ -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
index 952ba174406fc734fe89e25330410511f87562f2..1cb9216461ab03f810910547303d4b08d7776df7 100644 (file)
@@ -57,11 +57,6 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header);
 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){
     /* header */