From patchwork Mon Apr 19 14:09:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556162iob; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEEwpnDM1BWTI3qDwWqaLsei8YVfZClR1z8Y59I+mXy4TTKkg9lU+uV5xypMskRuXh6t5v X-Received: by 2002:a17:906:7206:: with SMTP id m6mr22431712ejk.281.1618841534392; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841534; cv=none; d=google.com; s=arc-20160816; b=ZsaG4BJ5sV+owT5KqFzgB0kuQP/ID0GvFPy1M67s8CDDjYPxBMkssc4/xg/h+JG/nA X12XoIxRg2cZu826Xq9KA+rQF4Get+aqz29VJm/RhuyMppSo7nZmWafwIJhXd6YJ7Qmv Xhb86JY7dUPfMScvQuddhBnTMxNE8C2UiG0kN0mrhto0Ebbghy6GI7A2rSl2g7O6cx1/ V9BNzaGmqRcQB7yeGgNsNm10avKDZOyRKl4jfFPvM++O8J91T74e9VivzelWCRkfByUC jOwPoXkNMPCiCmVobNNXhYpjJerYA6HSTBNiLCricK1XqkJN+tdE3AYqGSKPwoCUguK1 i3Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KTBA4Gu5kY5vPciHuHla5L8XkrsBdZ2MfmRbAOIOgsg=; b=vcmq6ke26aXmjWUsKuGJflHl8qvJyLRzQ21kdrr8+9e1tgKnN8h6fliKNXbzn3INlF OaCqFHYE7GzEDtArixrVPp/fF66xbmLx8i5kKUxhuabj8PRnhECjOyZr+mjuVqaOHNy5 A+hhIMP5f9MFOaL3UeTJquGn1VUufOIO8mUpK53iord0gFlbIBE8wN1yWFcSn6nnkZga LGFvm3b3pkI8bnZ5sCWGMVjny/gPqa31FkJrvHyC6EHMFC1pJVTibJQN5ZUB9byx2xo4 0kjgaasBljAZdbv2si8RuiLoP3H/7LXV4jETgg4FuJ8qWb1lZAfGrV2PBvJHScjgkErL topA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OOY58guY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id zm10si12656895ejb.623.2021.04.19.07.12.14; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OOY58guY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C0006809E9; Mon, 19 Apr 2021 17:11:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 108AF6808CC for ; Mon, 19 Apr 2021 17:11:24 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id q136so14895645qka.7 for ; Mon, 19 Apr 2021 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KADQrsRgdayZ56R8MUVdN/6K2b/ja3FQxM9wj1t6dxs=; b=OOY58guY+oi6SZKNvRQRxgm9JF70KpXC907W+HTPTnkt0iHg6l+d5/xT6gWJ9JjcoW tguPLX4QM0HYiZJiXENe6J8wHJLqeqMQJBv9nk2x9FplOFLXK/xoVB59TkExNmnHy9EQ t6uiEg9IMhhrxHap0CpOHzurMWES/pw7ueQWvgiGEHqQlwWQWHB4ohUEVbWm6AZQIrrA JQnkyXQXJ6DKlfyjpZhn1ldsCse+1LyEedAW2h6A0VhgPu8CQVcZhOAFS6kAlTQ89rj2 dCUbIZLMy3GhpbXjmTS0eGZIUF9Dl33pmhwCMeDZG519wrmLyIYnJ0Glq35Ke6tq9Wzy STiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KADQrsRgdayZ56R8MUVdN/6K2b/ja3FQxM9wj1t6dxs=; b=I8S6dclpYKgMzHzOtC654T11IT03kqTmKEcGOYfcX9F0iF9xYD922ILbek87ipTGLH j4zHXVA7K76L7+CLGVFDsH/IlvrovFiiI/wmzJZUI1U+A/oU8nJjhT7RyJ4WzSRrPXEB zY2hhc7AXnVwvXv9SAb+btAQKaj2UpOoayReL+cb4Na08LDhZg/KvKRfWoc6NLOc5Dcd zbLjsRvMMlcm7tqq/ekrBtYeVKz6kKc3mx1P9KT3F0fu/SsAjUR339hzJ9TYhHfp3vld LiCgeVijg/Ww+ua1qmcgcluZxc2YX3qT5WmQsDxRE7oxGgKHlHfMaRLAYo6yAFkOoaFh jGFA== X-Gm-Message-State: AOAM530vLtYR9YxA6orEuT0NC74rAfmuQL8UV789vSsToDvdFcZp28tz QHmcIc33IgAjOGwDl2pVht+ZekdEP0Y= X-Received: by 2002:a05:620a:8dd:: with SMTP id z29mr12196167qkz.84.1618841482693; Mon, 19 Apr 2021 07:11:22 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:14 -0300 Message-Id: <20210419141024.8174-18-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/87] avcodec/mpeg4audio: Remove avpriv_mpeg4audio_get_config X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tdX0ACEMSJus From: Andreas Rheinhardt Superseded by avpriv_mpeg4audio_get_config2. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4audio.c | 18 ------------------ libavcodec/mpeg4audio.h | 13 ------------- 2 files changed, 31 deletions(-) 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.