From patchwork Tue Oct 1 10:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp186118vqv; Tue, 1 Oct 2024 04:11:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzrfa/Tyb94Hed+uhrtBX757frOMXvkxgSCqgobH0bkdw+sShK53cV6lxZ6UBN+NzGVGu5nZTk8U0pBtNdZ/bK@gmail.com X-Google-Smtp-Source: AGHT+IGnf0XOoGZ+fwkRh0eqGsJaeJcGr8psMuIvxGtYs/ejS2cPehxANpQy2Nhh0W76hubD4HnZ X-Received: by 2002:a2e:742:0:b0:2f7:6277:f2be with SMTP id 38308e7fff4ca-2fad86d5689mr7359431fa.22.1727781074560; Tue, 01 Oct 2024 04:11:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727781074; cv=none; d=google.com; s=arc-20240605; b=Q7By5qwZK/O2TlS9Agmhr92garcs/hGoTyfHowmjHlpOpEgMkog7vcMDiozLh43gvW UbNUiPBShUETBuBf1smdLt0fBmCU+H8IC0vN5h+Mk+lxhGzRWG0TQiNsSJfOxeuEmvwt CSr7MMgXyDjkrUf+/HxQKv6yIzsGIeF2KTMBAEsgUzl0zyPo4jmFCo6tDcawDee2LHj9 GG1Ss3JRDfxdXN8+ohsUttQDAlRP5fytA7e+j1n239JoX6dPiT09p4aLB3MiNQnrdUJD VVPtBJ1Bh7mYtNzmCyld7YW8ZhAzreMcTInWh1R3RAMqw4AXevGvNdf2TDdlKiBoMczI JeYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=FHWdVsdDXFBx9BKMUZhEjMQs4xBpZEMlOkwSKc+MsWk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HbFNkt1Wu3lMtt1S/K8jPeTw/+AVjm/GOBTWVXpQdBgYdi89m9autQfWxntryUsXln qXGK/4Zqw1qEAZOTHEnVPk9D0pzWV3qXdugUUyq9z4jm6dU+TJMn/ItP3TayQq7LHToC OZbLR1LyxRzJ+nMyJWNSjSC7Ab5bglj/p+FzZtntEIz9ZawfmKsgpwV/Y9S6FFrUp2Ch kgOkDaXJSu/Dspu2djQlsfvMRovtXCs7Ws5UAvE14V+gj+JNKSybvLderilTg+43GXD1 0zcKwg5z0u/YLwgnxhkqBG3MUEU1LIXaAyhKyYFYUdv4hrkTbZgmjLvC+dnCbgE3uEAY /dgw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Ii15dMBm; 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 38308e7fff4ca-2f9d4603454si31794851fa.237.2024.10.01.04.11.12; Tue, 01 Oct 2024 04:11: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=@khirnov.net header.s=mail header.b=Ii15dMBm; 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 5A11E68DB1A; Tue, 1 Oct 2024 13:54:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C5CC68D9B9 for ; Tue, 1 Oct 2024 13:54:34 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Ii15dMBm; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AA0184E25 for ; Tue, 1 Oct 2024 12:54:33 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 2-pvgXp9NX0Z for ; Tue, 1 Oct 2024 12:54:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780072; bh=7eR03R+7kiJmsFhHQRFa1I9MH2yJJNyzn7ErvaCs8rE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ii15dMBmU7hTwzn9TmzhKDWyX4vZxyEt6x4udzNvZEQtULIKyfWK1bKybjBQAQ/7s fuONY2uWU/ywXEvcPT1G87SADq3vKOL9TrKfG5XJ0pFU1Z6ev9AWO/eBwA9LJ4ElFY OMCVYYgO+Cx8hiCx9RoDfOW/i31B5FiuyPIIN0nnstO8M4VRKAWmn1GoL+SX/+ZtwE AJUys3geWvu0u1rVTLIle2CqnTYxD9pzGUPU75nmbLUQ+P1NjxpFGh+rHwiDjOq10f ZVC1hNYwL46Jm+u9gyxVneZ8mjX0NErUZ7xshkwtNGi0rN9pypmgWXJOrRIYA9Pwzx VvuEbZ8qfX7AQ== 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 mail1.khirnov.net (Postfix) with ESMTPS id C498D4E02 for ; Tue, 1 Oct 2024 12:54:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 004B53A1DFD for ; Tue, 01 Oct 2024 12:54:26 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 12:54:11 +0200 Message-ID: <20241001105421.28967-6-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001105421.28967-1-anton@khirnov.net> References: <20241001105421.28967-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/16] lavfi/f_drawgraph: switch to query_func2() 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: f/SpFesH3m5T --- libavfilter/f_drawgraph.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index 7c6a83be7d..24288a1175 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -127,9 +127,10 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - AVFilterLink *outlink = ctx->outputs[0]; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE @@ -137,7 +138,7 @@ static int query_formats(AVFilterContext *ctx) int ret; AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); - if ((ret = ff_formats_ref(fmts_list, &outlink->incfg.formats)) < 0) + if ((ret = ff_formats_ref(fmts_list, &cfg_out[0]->formats)) < 0) return ret; return 0; @@ -482,7 +483,7 @@ const AVFilter ff_vf_drawgraph = { .uninit = uninit, FILTER_INPUTS(drawgraph_inputs), FILTER_OUTPUTS(drawgraph_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), }; #endif // CONFIG_DRAWGRAPH_FILTER @@ -506,6 +507,6 @@ const AVFilter ff_avf_adrawgraph = { .uninit = uninit, FILTER_INPUTS(adrawgraph_inputs), FILTER_OUTPUTS(drawgraph_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), }; #endif // CONFIG_ADRAWGRAPH_FILTER