From patchwork Sat Feb 4 10:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40259 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869566pzk; Sat, 4 Feb 2023 02:46:01 -0800 (PST) X-Google-Smtp-Source: AK7set+Nk8VrqByOIOWUm9g/MeFdbGWbvw4R1PMaCqq9r+C0VTZzxM7cXBGOP5HGQb5KFYiORltJ X-Received: by 2002:a50:fb99:0:b0:49e:1f0e:e209 with SMTP id e25-20020a50fb99000000b0049e1f0ee209mr7076505edq.10.1675507560947; Sat, 04 Feb 2023 02:46:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507560; cv=none; d=google.com; s=arc-20160816; b=rwGEN+GqVmnJx+caRBkkwvsUs7Kw9tptLENkhuSUukaQIPIz3VYCjvDr5TSgAGKfqa Cc6w8cLIGXQlLm/+EjrdyuuKzubKnK/jm+tQVdYcTUCwBFhMUwZlsAkfUHFl/urmI2TB m1LnmaIfnuu+2lXneU5fdCLJsIHWvqF497PJoGqkO17qWsUmbrIrozpi6qo8G7D/WH2Y l/nH/V5HzczQ1LKSZrplSlCpZoops+wAawLdRygPYJx0g9Iq5mANZjnJp7GX7Lweg0aB oKLyLgJxfjzJBpfat7gpdUSBDGKuD5PNhLIYOVslgU5BN6uFs772qMC4ILYivAC49xNO JJyQ== 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:delivered-to; bh=Ag4LCAo4dSlZcghvEOjbEpOfd8HNHsHTLEnW8bQRRTI=; b=WmKODgwXrux1CXZZboIt9bK8rA7iEafSnuHz3MHpdKPkwLRZRbJszLJfMoru080oJy bIaD6bwn0laGxLgGeOhM/JawSK7clxA4+UfkU6rCAOzGAmO4TiUASOUczZ2Meqx8MXmQ HxSzQNsG0El3hxldNLz9Vc5VCwxurvp09xJeAZYJnlB2AU8rdNKnnfIkDU5HID2oArgV zVKitdTn4f98qqZi31HvnzBPdhy3cxCStzvusNVzS8+lpyOt97dchhYJ8OdIhkSSfDVf +4oFH8okv+Vkhyr1CjysHkZjGxs/lfxA/N45GDwfav4at4Zx6W8ChFgXc7clQ8AjcRjZ Q4QQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l17-20020aa7c311000000b004aa9e5fe57esi1845763edq.311.2023.02.04.02.46.00; Sat, 04 Feb 2023 02:46:00 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4659868BEFF; Sat, 4 Feb 2023 12:44:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B984568BE9C for ; Sat, 4 Feb 2023 12:44:15 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 88BE4240591 for ; Sat, 4 Feb 2023 11:44:15 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Xy0qxiMT__WI for ; Sat, 4 Feb 2023 11:44:15 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 0A6A02406D0 for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 275C13A05EC for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:54 +0100 Message-Id: <20230204104204.20721-24-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 23/33] avfilter: remove FF_API_PAD_COUNT 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: n63ve71jdgv4 From: James Almer Signed-off-by: James Almer --- libavfilter/avfilter.c | 21 --------------------- libavfilter/avfilter.h | 10 ---------- libavfilter/version_major.h | 2 -- 3 files changed, 33 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c2ecdffa6f5..ed363351add 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -560,27 +560,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha return AVERROR(ENOSYS); } -#if FF_API_PAD_COUNT -int avfilter_pad_count(const AVFilterPad *pads) -{ - const AVFilter *filter; - void *opaque = NULL; - - if (!pads) - return 0; - - while (filter = av_filter_iterate(&opaque)) { - if (pads == filter->inputs) - return filter->nb_inputs; - if (pads == filter->outputs) - return filter->nb_outputs; - } - - av_assert0(!"AVFilterPad list not from a filter"); - return AVERROR_BUG; -} -#endif - unsigned avfilter_filter_pad_count(const AVFilter *filter, int is_output) { return is_output ? filter->nb_outputs : filter->nb_inputs; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index c2ec7a4b5fc..333eeb31c3d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -76,16 +76,6 @@ typedef struct AVFilterPad AVFilterPad; typedef struct AVFilterFormats AVFilterFormats; typedef struct AVFilterChannelLayouts AVFilterChannelLayouts; -#if FF_API_PAD_COUNT -/** - * Get the number of elements in an AVFilter's inputs or outputs array. - * - * @deprecated Use avfilter_filter_pad_count() instead. - */ -attribute_deprecated -int avfilter_pad_count(const AVFilterPad *pads); -#endif - /** * Get the name of an AVFilterPad. * diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h index 5a8bf4eda21..cb2238ffdd0 100644 --- a/libavfilter/version_major.h +++ b/libavfilter/version_major.h @@ -35,6 +35,4 @@ * the public API and may change, break or disappear at any time. */ -#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) - #endif /* AVFILTER_VERSION_MAJOR_H */