From patchwork Fri Oct 4 08:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp281686vqg; Fri, 4 Oct 2024 02:39:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVLYbpcTa+VoXCufCbdGyRpjuOXhgihr3alcKseLn8aGor7u9HtDhmGD8Dz8FpaAsTM0ss9zFF8CK+ONnaboPaB@gmail.com X-Google-Smtp-Source: AGHT+IHI1n10ZJvaWxujfVgeVm1TvNTm9wJ9E6lmweHYg/qy/9MUPmL2h33S6VMfGaIrwjkU9FTc X-Received: by 2002:a05:651c:506:b0:2ef:1d8d:2201 with SMTP id 38308e7fff4ca-2faf3c29208mr9376641fa.23.1728034755763; Fri, 04 Oct 2024 02:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728034755; cv=none; d=google.com; s=arc-20240605; b=GeGTVKYOJybtvvDNDwkznUsShJbQAjKvx1mXzo7hyQL1+CoZVnBpj/vd/zUn4uJwjB b7iBJ5oH5kdfz/6KYdcbN+rNj0dqc29l4ux4cW4aqjcTPW7SHjc6tzNF9YFBhJ8dSPoz qUolfkVgPDpv6KUK+6t7wdqoxPT+RKPx/bfftDJXikhDwC1i8my+rAh27su6L/bK0oWA /2hU+UUmMYsfJsR+25cx+YZlP1VCX/dOJYEYmqeOK18r+LP+/Ho23PliMQSOQgAYKO59 +oSfAms/lb/dCWexbhzmV+hmI0AVuVbfE75Hf2buRQ76MhFpm8aZVmxpU475qMIxRzUs nnww== 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=wZzkZLE3abocAEtBieiJ2vPfJjT41hfWSGKNDa/wjzc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QJSgvix4iWOQcA7g3p6x6HB4mvMO3VbhlIp0PhhBJYfxVCYBIdVO9/gGoVfTFWzpYv TCCM855DqVT6PmK1Ym3jluaGZjRyb2ZR9PnOUiWgPKKqiTW70IIJYjn/+xTM6eUJijKY 2L1vdHMz955fjvovWSnp/Nx0uoiUB2zzhNIICcrcCxcqPUbax2WiTRgizrjZ8p68NKnv 35g5SdFPMzZlZQDWcSAqgtol0Il5yunaZKqzXr8jNSCjUmunJhsR3VVU5o0bNXxGCPa6 ntdwjG2BvDcxHFNSJerSFgnjme7lEmgxp1eQpgqURvcycrkn7tAK1J6BMfEaoeFuywbv JNbg==; 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=bhuYVUPN; 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-2faecc4829dsi10477581fa.280.2024.10.04.02.39.15; Fri, 04 Oct 2024 02:39:15 -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=bhuYVUPN; 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 C45E768DBAD; Fri, 4 Oct 2024 11:43:16 +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 6B2CB68DA58 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=bhuYVUPN; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 769144E2E for ; Fri, 4 Oct 2024 10:42:53 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 1ZgaD5S_05wb for ; Fri, 4 Oct 2024 10:42:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031370; bh=kAEiTigaC+LBcXU1NTx4yBVaRRnmT5K64qsbPrx4CzQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bhuYVUPNR5b3tMSDKQmEYwvwT676p7Kw9xzYHfeg5EPLSLoNJdwWBMYSuvL7I0vBY jlcRfqg3W6Lz/BtZnq+68CCyYk7j2HumZqvDWUjmtwcghanXcBlr//TjVWxF/LwmLe 9AW8t0tqAx2U9bcjcUmVMP3hX3XR6JpBHEjQMc8TNbFm4iQWcHOvdCRKw/pOkfsKZA A3+6yL0o4HJn+PhmDXlCqlT0I21ZBp9WD128k89jm4y5G6qqudKHeORf4UKZKYv9RC Ne8Vw5S6eWdYWc1RRXmKy2YvXnZ5OhQnWbjbrv3ne2qGYx8SholHHNu1yF60np3qJ7 CdVQGfI+vU+sQ== 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 31D4D4E2D 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 265713A0F41 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:25 +0200 Message-ID: <20241004084230.27419-15-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 15/20] lavfi/vf_fieldhint: 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: Fkltv0Q4J9wR --- libavfilter/vf_fieldhint.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index 92e3c5c8b9..d1f05562c2 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -85,13 +85,16 @@ 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) { int reject_flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_HWACCEL | AV_PIX_FMT_FLAG_PAL; - return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(0, reject_flags)); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, + ff_formats_pixdesc_filter(0, reject_flags)); } static int config_input(AVFilterLink *inlink) @@ -329,5 +332,5 @@ const AVFilter ff_vf_fieldhint = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), };