From patchwork Mon Jan 16 13:38:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038570pzb; Mon, 16 Jan 2023 05:42:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEFpM7nJpJn9A0yoY6B1RJo/hy/iwZ3ehfA0RjCO4ka2sTYCrPkGnbu3pLlS+Pqr1K9cG0 X-Received: by 2002:a05:6402:1d92:b0:49e:16fc:b525 with SMTP id dk18-20020a0564021d9200b0049e16fcb525mr3929615edb.41.1673876521689; Mon, 16 Jan 2023 05:42:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876521; cv=none; d=google.com; s=arc-20160816; b=qI/+LuDIeSx9akzTcnMRsvXqOKOiFaUq77MIpQTNxbJNBmYtZAveCA7/F5pgFzUWmP yCk4tLZZG6vEBqXyw0v8vyjMhbwV9HzYKgglMgZX5Ftx9ZF7QhAUI+CHGJnMJIRV9E0S 2TVuXUGoBpDyAJtZKexNmlK8GdUF8YYOBsXXjNWKOCUe5jgpDUC0iSPoQfeM3KjZ3c+j o5BGg7nzFFonFifLWFg+dL6V10vFiPRlQph7v2S/zq2wMdGHBbm2WIj80qEUoupvJv+J GmQCmOvwfzs+Q4HvxdLeVPZJ6OYeKKVn26Z/YX4fN5ybAfkGQ6F2pisnJdzfcYNj1JLT XbUg== 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=SemvwSRGVbTTbfHQj26Afb/1GUPkDOUfu8XlEUb0DEc=; b=A1A45rDJ/jObAexjHp/2X5Xi8wo5WVMyYtqW65YEi9dtXayQicV2WsjwJM4t8kx+Oo iQjDptwkidfULpb6Cj1zLFu1wbKO1ey1it0isCFsjUmtKfYFNbAsb5qwOQPOdq9cFEs+ tZJOM6c2Ut2ReBUPOAajYG+ZnqCvFU2j2/pn52FIXNPFy/3DHUXGCpdChaDYClH65jEH LTRyuoSS7uOqvrL6mOeXArAUDVwBF3cjiyivumuoC+kEVpfE0r5usDMVCm/5vGTI6HIQ T2FqkHkKJ1nlgSgrviHinDaN2KAEWuv5LPISCoLxvbUGjKHiGlb0ZZ92HBGv7uAr8bdY uezg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oiK7vZit; 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 et3-20020a056402378300b0049e1913b734si2296735edb.200.2023.01.16.05.42.01; Mon, 16 Jan 2023 05:42:01 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oiK7vZit; 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 EC65668BE13; Mon, 16 Jan 2023 15:39:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 975EE68BDF6 for ; Mon, 16 Jan 2023 15:39:29 +0200 (EET) Received: by mail-ot1-f50.google.com with SMTP id cc13-20020a05683061cd00b00684b8cf2f4dso7906743otb.12 for ; Mon, 16 Jan 2023 05:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Qt8Ut/ynoDGRWR2hO+lpxG3FYW4hgA1cElpwk/sB26I=; b=oiK7vZiteS1pE8nKqnJe0BxMbQgcyTCiN4s7VQhUMtbfaTGa+x0FU6rxuomk8bxC+d 962VN+Wp2ZosDe5nf8ScsaX0qWYzoPqkNhJBSyaQe80X3hon0oEBH+vmnA/CWDy9b/qC ssWHsH9hUHozHLPs9QgB/G+fnJOc/K3JafdUaXZ8nqDZHx8W8hA3gSDIfTuypkSd1TZo DdLz4ai7b33pgXnmwXwtNipngSm+LOyXxJ5T6YIWB/K84PDzNDMCIY1mLRuvrAE+hqVH BkV2Bxrm+gxyFoLh7fBmhfBOacCnZYk52SwVQuxRGk7nY14I87lw/EKjmjlqI/tvq4Dj NK1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qt8Ut/ynoDGRWR2hO+lpxG3FYW4hgA1cElpwk/sB26I=; b=0LjZo+7/sjkO7HiNjFZbLI+k+grMs1As6THBCLpuMFpSQtj34q2Wk3zhN1PQDtaIWc 2StnPGsMyIB5jp0G4Jj/fwrarAc8r9XUolJYhHem+T7C8XXttpmCxeaSvCsSRBFtnST+ JJvq29hXCXQH3SS7fdS1yHCchkKc2ZkN/USyckwJBPVY45iT+Ax2fZysBn4geQIBa9fC XUIM/oa6kv4yM7xV/H6WgLNQDxLrAQRGyjBUinRa+FAlTCWm1pEdP87j+8+mmzb8yTTc YHyGQyD6QE+fbHC1UYBTZA9EzJV2UBC/LKB6P4LFq2ug63KigxYkVa9PFx4qyiGMhk2j I2Zw== X-Gm-Message-State: AFqh2krO3LNw7Cerl5/yDZqDDsJPAi/kyASlrRz3tNjcUrCUvHg5vEm+ sUAkapSP40WF4zt/12YrrZMGcxXF84A= X-Received: by 2002:a9d:6acd:0:b0:670:a10b:f343 with SMTP id m13-20020a9d6acd000000b00670a10bf343mr40934567otq.9.1673876367686; Mon, 16 Jan 2023 05:39:27 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:27 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:31 -0300 Message-Id: <20230116133840.512-18-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/26] 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: +sb7/LzNbDiz 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 c2ecdffa6f..ed363351ad 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 c2ec7a4b5f..333eeb31c3 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 5a8bf4eda2..cb2238ffdd 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 */