diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 01:39:47 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 01:39:47 -0300 |
| commit | 006546c635f05444cd7dd241f9e65bef346771bd (patch) | |
| tree | 0dc5ccb6a865b76b33376e12c04d4861cfcedd5d | |
| parent | 700da852b58bf3354dec6652dc1500192ef63154 (diff) | |
| download | ffmpeg-006546c635f05444cd7dd241f9e65bef346771bd.tar.gz | |
avcodec/mpegaudiodecheader: remove dead code
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/mpegaudiodecheader.c | 12 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodecheader.h | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index ae86b087f3..6cc79f18b5 100644 --- 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 diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h index 952ba17440..1cb9216461 100644 --- a/libavcodec/mpegaudiodecheader.h +++ b/libavcodec/mpegaudiodecheader.h @@ -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 */ |