From patchwork Sun Jan 8 12:58:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39916 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2423268pzb; Sun, 8 Jan 2023 04:58:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXt1G0GBLjsPMWhWcWTY/2PFiTWBltgXRh9MZtbBoILEWoc9xxmYrNzJY1JSP64A3Y600BG7 X-Received: by 2002:a05:6402:c4c:b0:48f:acd1:8da2 with SMTP id cs12-20020a0564020c4c00b0048facd18da2mr13849175edb.27.1673182727441; Sun, 08 Jan 2023 04:58:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673182727; cv=none; d=google.com; s=arc-20160816; b=nIUGZyAXdpxwPb7hOzzR0QwyPJONjZIIE2DLIJX9ayke5sa9THgVyLjnruv1B5dEDf tMX620ZEmK8TlzOgwMC6tBE/txse+T3Z4yxl25AdFRq8PNTmO6KtXbG7SOxwaYqdt23d inzZW6VX456hTYvEQb+b8/spJgcXaw2Rvlqb9W77qbY3NkCcJxHckMrEcmw5nxWpeDdH L0EWLA1TJDsOk7iH3a04CIYIcqvmBABmY55HLnjAqgQMjlDbFA5s9GTmY9+7nhVd7O3A QSR0RF9MlZs+hON8COU+PrGsZL6H9bA0lC4USH9XgJ4zCnbTxcVWYIXnbok1tgXzXI4s g65w== 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=hUdnPdlRuCY1T5SN7TTzzMUczki5YyQGsETbayt9UMQ=; b=kcd2yk9hBUtmLV6zfJFE66P6L3IwtPPde0ql+srRD70qLPOOXWmG9bimKxxuUE6aKN 9ddUaSfQ8C+zaP9Gxoj8kSf7wKn2HNSAUAWTEqlPkG/Fx0iAomssLLyFUmzKvZni2G3Y PzqRhbnQxlu40KiR+wgkmgsYxY9u9Po1FzIIgsZ+XL9/eY3ycDrHmXWQT1G4756ORWOc jM3VRaPrJWbEewEJAJn+N8a8/t0Di2FBlrHXYOdIlchwxW+BpepCxb5ApU9ugh7NZL4d LGCtc98gOawc9twcK6MBH9ow9iU2yMRuhYM0XT+nsFt03Ia9nZe2aUiV1KRUUOB6gCsR h8kw== 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 z5-20020a50eb45000000b0048b2c1d1621si6412253edp.83.2023.01.08.04.58.46; Sun, 08 Jan 2023 04:58:47 -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 0E6F068BAAE; Sun, 8 Jan 2023 14:58:42 +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 C59E968B612 for ; Sun, 8 Jan 2023 14:58:35 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5ED91240499 for ; Sun, 8 Jan 2023 13:58:35 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id qYxB1scl18pT for ; Sun, 8 Jan 2023 13:58:33 +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 BCEA72400F5 for ; Sun, 8 Jan 2023 13:58:33 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 565A03A0344 for ; Sun, 8 Jan 2023 13:58:26 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Jan 2023 13:58:05 +0100 Message-Id: <20230108125811.17967-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230108125811.17967-1-anton@khirnov.net> References: <20230108125811.17967-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] lavfi: remove AVFilter.init_dict() 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: yWpoMD15yYZo Nothing uses it anymore. All options on all filters can now be set with normal AVOptions mechanisms, such as av_opt_set*(). --- libavfilter/avfilter.c | 2 -- libavfilter/avfilter.h | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index cc5505e65b..e5dd0cfdb0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -912,8 +912,6 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) if (ctx->filter->init) ret = ctx->filter->init(ctx); - else if (ctx->filter->init_dict) - ret = ctx->filter->init_dict(ctx, options); if (ret < 0) return ret; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6d68ebece4..c2ec7a4b5f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -276,19 +276,6 @@ typedef struct AVFilter { */ int (*init)(AVFilterContext *ctx); - /** - * Should be set instead of @ref AVFilter.init "init" by the filters that - * want to pass a dictionary of AVOptions to nested contexts that are - * allocated during init. - * - * On return, the options dict should be freed and replaced with one that - * contains all the options which could not be processed by this filter (or - * with NULL if all the options were processed). - * - * Otherwise the semantics is the same as for @ref AVFilter.init "init". - */ - int (*init_dict)(AVFilterContext *ctx, AVDictionary **options); - /** * Filter uninitialization function. *