From patchwork Fri Oct 4 08:42:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp268830vqg; Fri, 4 Oct 2024 02:09:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTSQZtY6gDC4HrwvDpYMyIlWT6nZExf7sOMT6W3wZxUFx0mMCOHjIdngEWIcB4alMBYsSEgXtqIZ8Dtn0JzBV7@gmail.com X-Google-Smtp-Source: AGHT+IGNl5ue4peIiiD/5BgYBszvvHpAR4hmxstqMfdnLgCPGa5gBdq0fi4QTWFsdZkGa2lwCkSu X-Received: by 2002:a05:6402:2682:b0:5c5:b90a:5803 with SMTP id 4fb4d7f45d1cf-5c8d2f2dfe4mr1984345a12.7.1728032946817; Fri, 04 Oct 2024 02:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728032946; cv=none; d=google.com; s=arc-20240605; b=FToUByORF79bNTlNf1CW7Rjrs8XY7JRSynT0LqlowLoSACXID7W7zfnIqwGZF8Q3kh Zw4YUZDps4jRWTDiupbQtCWQl4cZjBxY9qiHjBaS5qcbxxEIUEW7VYebNSMzYkuxvnGK M41fAo77Yj5dHgY/8rq0gKhE2ou3C50ZxrvbvuGIYWWa1tRL6YikRAn+hFAbvONh3Shx +1gmUQi1OlCdQUaudHNg7bthCsAA8wLJYaI/wbdvZr01c362qtr0CWLcFTSs2dSYhLOk vbrpWX0NlBxtKUotbpQ6Hk7EudDJBT5YNhJqcAk82x8PJe+y5QNf/qclkZljf9F3QMa/ 2tRA== 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=mdmKivBMdK263vG2RIuP0+VhVMkACS46CTaHE8llh8A=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LvX+zwhM4x3bXD00aHjZEWk15QKXdrdUdvtwNhezON7iZTYAzBPY0l5BmPbvpCi5DY 6/Beoz/RHulX4U8TCjDyLlpoCefEFb821+foQoAt6Uo6YDxuGXSXf+3UqNcX7VR2aT4q bH/61pzy/JpVd7l4k7aTtP/rugNqSEyY3XKtNF5lCjnVG/l8TNAfb8wnuy3RQlnlbA8i s2u4eT/yK97/t+ObeyMaBm+7w7RlQubLewgQl47NjShDNP6gKo6CEoIZaZINu34g2e52 iaTiqrgsVlXaxmPC/+LI2vxsigrMivj6AE44IGUBWQQLiP1sxiynRJPA/omkv1+00hPp jJfQ==; 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=LpERTyv2; 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 4fb4d7f45d1cf-5c8ca47d54asi2013511a12.255.2024.10.04.02.09.06; Fri, 04 Oct 2024 02:09:06 -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=LpERTyv2; 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 5FA9F68D9CC; Fri, 4 Oct 2024 11:43:00 +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 7E8E068D4BF for ; Fri, 4 Oct 2024 11:42:51 +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=LpERTyv2; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 2F273EFF for ; Fri, 4 Oct 2024 10:42:51 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id cj3-7L7Oaoev for ; Fri, 4 Oct 2024 10:42:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031369; bh=EbNi4QPHMc1Bs5G0/0k/0XqhYClofdCwB7AHHjATbXA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LpERTyv2YG55rMlE+DXNYkCcrmyPOHeo2554tVOxk0n2y+zGPy07atJlpMWt0BCB6 noo4aS5SeZvaIVY8aq/eqVbAsF7A0TmH+JoECJVPk6KMwiIr2OR7438WD0StE1XkUa Hx+gI2v0c2tAfn3Xs/l9vDyLGLSNtpWJLOdyjVl5VCPzThtB85sgmROzcKN5V2wOMV UuCLqBSQypJySdQwpbs2Cm08ji90hFlhJjc9tvly8EqghdZw6kUCFmOuAh6hw9SVx9 qvPcueSgx1+oamTv4W5U6Ng2uU8YaCOWRAlFj29DIEypOiuAEMK8hY8F5zRrl8YY/e dbL/DEF01ae3Q== 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 AC7544E0F for ; Fri, 4 Oct 2024 10:42:49 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 979E33A0F41 for ; Fri, 04 Oct 2024 10:42:49 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 10:42:13 +0200 Message-ID: <20241004084230.27419-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004084230.27419-1-anton@khirnov.net> References: <20241004084230.27419-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/20] lavfi/vf_ciescope: 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: R0FxEr1fSF6r --- libavfilter/vf_ciescope.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index 260ca26187..8ca47aaafd 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -139,14 +139,16 @@ static const enum AVPixelFormat out_pix_fmts[] = { AV_PIX_FMT_NONE }; -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { int ret; - if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &ctx->inputs[0]->outcfg.formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &cfg_in[0]->formats)) < 0) return ret; - if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &cfg_out[0]->formats)) < 0) return ret; return 0; @@ -1559,5 +1561,5 @@ const AVFilter ff_vf_ciescope = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), };