From patchwork Fri Oct 4 08:42:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp310386vqg; Fri, 4 Oct 2024 03:39:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVn15UPfO4qyqJe6HcCR+YG4/MF7WqUy4znuf3/JZUnknu/0l8bhAODe1rQ51kFvfZuQ88GQp0EOdqEazKarunB@gmail.com X-Google-Smtp-Source: AGHT+IHOidaZpkLKzUlQkEKVXfCE/z3YNzua7O3jNqetj2Btvtt5pUCB68ZGzfQmj4C3J0/ZqouT X-Received: by 2002:a05:6402:5304:b0:5c8:9e36:cca8 with SMTP id 4fb4d7f45d1cf-5c8d2e3453bmr1338765a12.20.1728038348286; Fri, 04 Oct 2024 03:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728038348; cv=none; d=google.com; s=arc-20240605; b=ZaWwpBSi9T8Kgrblh1c+JpIGlwYtzMyEyfbVFdpFN6fXndrZsshFd7O69andGCygRd fuKubW6FH83fUYq2Ad5O8v+AioN/khl1Bk8GgZEbhqHyN7HJN6fcNMdo5xGxhfhjeaMs WPkIDMCvxnrSnebSSnf8B2Yb92WkuYj+rPd4J5J1lGCx9jKN1ipS36qBwKR/iUaLt0yQ HeT201p6SW3BedAjhsQEefUjCjKrnebKbAjtgdA+2wzFjw1Je6EIeUAlNTYwHPJ/ko+C NB1mjVi1FbDIQD2CvOtUfs7X/myn+mpX4gZmmiEYHKkwiX1kt6tBpQDimqB76KOThbGM gRaw== 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=+Xwh/S/iODagrnXpXBsmTgFqBkINEuyx8NynI0sUZX4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=i4KsUOWtwTO01b6fdu3JV4g2Ajweb7YVTh7lb2yVVfp0SHNyWvseIvPi5vxQKH7Qvu HZmnXGY5xFA8Ykkfmm8N/VrgvcTOJ3fEZ169P10bfFlpQbIPiP4w7lAPPtrrpyTm7au0 y5Mkh2vIGqnKdJWVg2zM9ytwBKSozbKo1MYU5rWwH8KfXZLdneOjcmC56NzQIn9+cef/ 9FH/wTXQEjny3NPgWer7j4g7nQXr99me66nkZ6sOk8TtEmMz26shw+Ko1VKzjq8id3Y+ 21OjEr2jELU+DOmYmPGwySAAjuQW9DtJvSPQXkIx4rUzTlmoc8bxCwSONGCQzxuaZr1O 0ZPg==; 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=boRmn4Un; 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-5c8ca4b5867si2210184a12.553.2024.10.04.03.39.07; Fri, 04 Oct 2024 03:39:08 -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=boRmn4Un; 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 E41F968DB2F; Fri, 4 Oct 2024 11:43:05 +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 2B5C268DA10 for ; Fri, 4 Oct 2024 11:42:57 +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=boRmn4Un; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 88D5F4E20 for ; Fri, 4 Oct 2024 10:42:52 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id SJOOoJMDu5fF for ; Fri, 4 Oct 2024 10:42:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031370; bh=z82z5O22kMv0ErBt4yyUPtGKTfKEWcdjfS0LztdUYzE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=boRmn4Unf5wPUJGNcicIzBFjunIrFWMKPhriCY0KBvEG/dZs7OpbOBXKwKL7PIaNB yXJGOzAYLA2Qw3d53ClrgE8zozqJkgdoGCAdgsI+T5nbE1JYRR7EVSJSbT+1al4I1x qgKWYkrSOgF43u3rNZaA9R7I33sq9B8C7GuE0ELNWjCFI0mJ59ILzg5R/RpGyGivO5 pFHUXfqg/Ll9/CM7JGG4IyIwUIms0itMQD/4wowtDUL2n/SwVEJoWXhw9FumpqM2M9 zQDFmgfYn2OHbvNNRmdsX96bqZsoXCdTI+TPaP4NLyZ3x/Sd0FEU7oKxkFm9SxmSaO 3/nxGOoD3ckeQ== 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 316204E2C for ; Fri, 4 Oct 2024 10:42:50 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 10C3C3A1A81 for ; Fri, 04 Oct 2024 10:42:50 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 10:42:23 +0200 Message-ID: <20241004084230.27419-13-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 13/20] lavfi/vf_fade: 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: ptj9wPHcSAC8 --- libavfilter/vf_fade.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index fb04c7ce32..39f16b0b3a 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -101,7 +101,9 @@ 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) { const FadeContext *s = ctx->priv; static const enum AVPixelFormat pix_fmts[] = { @@ -162,7 +164,7 @@ static int query_formats(AVFilterContext *ctx) else pixel_fmts = pix_fmts_rgb; } - return ff_set_common_formats_from_list(ctx, pixel_fmts); + return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pixel_fmts); } const static enum AVPixelFormat studio_level_pix_fmts[] = { @@ -566,7 +568,7 @@ const AVFilter ff_vf_fade = { .priv_class = &fade_class, FILTER_INPUTS(avfilter_vf_fade_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };