From patchwork Mon Apr 19 14:09:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27142 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1098108yba; Mon, 19 Apr 2021 07:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWmtM0RjYEifAd0OsKzIPcDWJHUjjyUOv5gn/uon1aeWdv/aREUI6+9M+gi6yC6Er/uuZl X-Received: by 2002:a05:6402:34cd:: with SMTP id w13mr26193851edc.73.1618841965143; Mon, 19 Apr 2021 07:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841965; cv=none; d=google.com; s=arc-20160816; b=EO8IlYT3G/gytVOPoLanRTkUQQ2SglXH/WJ09QOEQLmkbF9trQvuxKF3a8xD3TSlhG B3tCyQkkwITpWPX0FkRS8DQ5k4DKOEOA9lDwOhe+pvCwgZbvNyrgS2Y+JkQLrVrAlBpA 9QqIWCf1hY3BU6c0YcmkA467u9JVDaIgHNEwDbis41cNgoxCg9X6Xp4sETVbA6nzF9vt e7xZ/jPWZrKcUyg6nk1vuGQz8Mu23GGRV3i0VaQxnBpJKrRw7yihpNJie0dYmJv7/BXl 6eE/HrLExT5Ae01GaCqOOipCaIMbmKGizJWh1rlDOhQTY8duFjB9K8GMQm2/a2l9jhS+ 5ExA== 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=tehfE+bpWv/xszziRbYEIJAbJCL8FU/ymzfxIs6opfE=; b=ynhXOau6+GHP8XdEG+81UMbEbZxMIZ6GMpiEv0kALuZtSfI/v09MpJwt2HNEsS8VHb KfKv3QbP6Dxo4Drk50LQ6wQ0FCclwiLTe6KbPfUIfzyBsHCnowgw5BtNDnt6FlEmUftK GrHqM2CsxlrSsuRvVd1TUe+4aqScrCpMCV0dUkcFiWv+I1ogR4WpflBGieaOBYCAUKRq mdXseWsZBbaVTlwbRfLom5W0sFDSWtyeesfO6U+cvjStYsbzSJw77rcL8Uk01MDVr/qS ivUPDQDMkEI9NdsS+u0DhcKh5mwa6XH3wbobXK2nEg+l9KeG6kNg0bquwNjhLE/lJDam Wg0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d96M7IKP; 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 x13si11864923eju.369.2021.04.19.07.19.18; Mon, 19 Apr 2021 07:19:25 -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=d96M7IKP; 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 508C3689A61; Mon, 19 Apr 2021 17:12:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8193C68993B for ; Mon, 19 Apr 2021 17:12:06 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id dp18so12294113qvb.5 for ; Mon, 19 Apr 2021 07:12:06 -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=BnyvaDuGNlOQqu5PSkFlg8TkBLSDcOHF2k9oZXP40dg=; b=d96M7IKPyJjkdDG23+IBJoDHmP+mjgvjXQwcMGofHx0FrJgRRc4m1OqjQihKLCJc1g /nlT1BXyR/zu1qMRL0YJhrJv1aliGcbW5UXqWb5bkh7v7LAuQeyXfkM7710W9h1o0pVf HTPbhtnaUJAEfPzgHc5aI5K3C+dRG9K3NBN2XPwgDbdPIqR2ub/yVxjq5qBOwJE/9Hor reH5Khi3P9UnuTgJhRAU0X17AaZ4BUjFjYJbmcLz5DEryT28T3Q+vvED2T7wQbsf/FJx iFvefxuCLSFKCAwpsO3wcZbId0vZpypF03U9kpBzkbxn3WCeSzdPBJAnO1xDhZO3rwtT u3yA== 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=BnyvaDuGNlOQqu5PSkFlg8TkBLSDcOHF2k9oZXP40dg=; b=t2TOn1BbTKBXQmsFZRrCU5/sUGOlatyAZWTEb+qDO/qn3xuwGQRZrE/W5Wrk2mDQGG xkfEg6LgkQZajDrIvifQ3LkNKhC9+KQANWwjoLCU8vMFcOQzjIS3vxhnWxefXejTLWXN anPtxg3Joy+QGkrUdLWgG/yjOya2F4yW+Wq4kmC4jHbiPDqAVJO0mkLCf7wwcY8rj3tn IGBF2MW5APYCfu5Tax3OF1wlh96gtnW5/nL8WTrn5pGiPI+8C8Jv4pDOGxIjcDLxVP1m tSfWM5b9YuLrpp8TfiqZhsvFhpk3tbAd+DkmfIhs5djswE0ZOYgV/wXHaXFBbE9P4FEd ELqw== X-Gm-Message-State: AOAM531sL/8SL43AXzLxo7gtHj5bf1i8NNh9vgDQCSmZwCRJ77EQjzGg H3SWdzOIQRi6dL0XEK5IgBYs9GGP+aM= X-Received: by 2002:a05:6214:da7:: with SMTP id h7mr4462624qvh.48.1618841525212; Mon, 19 Apr 2021 07:12:05 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:50 -0300 Message-Id: <20210419141024.8174-54-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 53/87] avfilter: Remove avfilter_next/avfilter_register API 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: geqn3OSsaCWa Content-Length: 3843 From: Andreas Rheinhardt Deprecated in 8f1382f80e0d4184c54c14afdda6482f050fbba7. Signed-off-by: Andreas Rheinhardt --- libavfilter/allfilters.c | 38 -------------------------------------- libavfilter/avfilter.h | 35 ----------------------------------- libavfilter/version.h | 3 --- 3 files changed, 76 deletions(-) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 0d2bf7bbee..7dbd1fb1dd 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -557,41 +557,3 @@ const AVFilter *avfilter_get_by_name(const char *name) return NULL; } - - -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -static AVOnce av_filter_next_init = AV_ONCE_INIT; - -static void av_filter_init_next(void) -{ - AVFilter *prev = NULL, *p; - void *i = 0; - while ((p = (AVFilter*)av_filter_iterate(&i))) { - if (prev) - prev->next = p; - prev = p; - } -} - -void avfilter_register_all(void) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); -} - -int avfilter_register(AVFilter *filter) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); - - return 0; -} - -const AVFilter *avfilter_next(const AVFilter *prev) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); - - return prev ? prev->next : filter_list[0]; -} - -FF_ENABLE_DEPRECATION_WARNINGS -#endif diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6e4b2464c5..54fa656b01 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -286,14 +286,6 @@ typedef struct AVFilter { int flags_internal; ///< Additional flags for avfilter internal use only. -#if FF_API_NEXT - /** - * Used by the filter registration system. Must not be touched by any other - * code. - */ - struct AVFilter *next; -#endif - /** * Make the filter instance process a command. * @@ -710,33 +702,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha */ const AVFilter *av_filter_iterate(void **opaque); -#if FF_API_NEXT -/** Initialize the filter system. Register all builtin filters. */ -attribute_deprecated -void avfilter_register_all(void); - -/** - * Register a filter. This is only needed if you plan to use - * avfilter_get_by_name later to lookup the AVFilter structure by name. A - * filter can still by instantiated with avfilter_graph_alloc_filter even if it - * is not registered. - * - * @param filter the filter to register - * @return 0 if the registration was successful, a negative value - * otherwise - */ -attribute_deprecated -int avfilter_register(AVFilter *filter); - -/** - * Iterate over all registered filters. - * @return If prev is non-NULL, next registered filter after prev or NULL if - * prev is the last filter. If prev is NULL, return the first registered filter. - */ -attribute_deprecated -const AVFilter *avfilter_next(const AVFilter *prev); -#endif - /** * Get a filter definition matching the given name. * diff --git a/libavfilter/version.h b/libavfilter/version.h index bbadb00f0d..68923e4bd4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -53,9 +53,6 @@ #ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) #endif -#ifndef FF_API_NEXT -#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_FILTER_LINK_SET_CLOSED #define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) #endif