From c57d07c3d52ac303ee6201dd337694634997958f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 25 Feb 2021 19:59:35 +0100 Subject: avcodec/mpeg4audio: Remove avpriv_mpeg4audio_get_config Superseded by avpriv_mpeg4audio_get_config2. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavcodec/mpeg4audio.c | 18 ------------------ libavcodec/mpeg4audio.h | 13 ------------- 2 files changed, 31 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 2286303b54..be50de9052 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -169,24 +169,6 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, return specific_config_bitindex - start_bit_index; } -#if LIBAVCODEC_VERSION_MAJOR < 59 -int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, - int bit_size, int sync_extension) -{ - GetBitContext gb; - int ret; - - if (bit_size <= 0) - return AVERROR_INVALIDDATA; - - ret = init_get_bits(&gb, buf, bit_size); - if (ret < 0) - return ret; - - return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension, NULL); -} -#endif - int avpriv_mpeg4audio_get_config2(MPEG4AudioConfig *c, const uint8_t *buf, int size, int sync_extension, void *logctx) { diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index b274e92b62..3187df68d2 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -59,19 +59,6 @@ extern const uint8_t ff_mpeg4audio_channels[14]; int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, int sync_extension, void *logctx); -#if LIBAVCODEC_VERSION_MAJOR < 59 -/** - * Parse MPEG-4 systems extradata from a raw buffer to retrieve audio configuration. - * @param[in] c MPEG4AudioConfig structure to fill. - * @param[in] buf Extradata from container. - * @param[in] bit_size Extradata size in bits. - * @param[in] sync_extension look for a sync extension after config if true. - * @return negative AVERROR code on error, on success AudioSpecificConfig bit index in extradata. - */ -int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, - int bit_size, int sync_extension); -#endif - /** * Parse MPEG-4 systems extradata from a raw buffer to retrieve audio configuration. * @param[in] c MPEG4AudioConfig structure to fill. -- cgit v1.2.3