From patchwork Fri Oct 4 08:42:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp281700vqg; Fri, 4 Oct 2024 02:39:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW55VQIzzubKMwrvKbGBAQmDtJx1jLahK2Es5/d4vDElM1xviGHc/6U6VODfq96raZo3BzugRlvIzA5u9rcxajt@gmail.com X-Google-Smtp-Source: AGHT+IGPy7LWwXcKXDmuev17jWxPjXrYFBdZiDmvz+zjLfaMSfQ65N6QTrgIDWvm1CZmbgjDGPIj X-Received: by 2002:a17:907:948b:b0:a8b:6ee7:ba22 with SMTP id a640c23a62f3a-a991bd76bf8mr206911666b.39.1728034758301; Fri, 04 Oct 2024 02:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728034758; cv=none; d=google.com; s=arc-20240605; b=cNMI39eUo5Mdmw+5uXJGyCuxJ5c9yd0WtIyvzz6k46mdnnCfeerLSFoP+AD5o1FE/n hTZ1UzSz6F/tTlg13CfOvogUuLba7PGMVFFrYyz7MPUN0rzZgjyX0D4cEpL0zKU+oeLy dFmbNRCaX2+0KYkR52rO7NHpzxLp0uDg7GzoVSI3cDdBLXC4GUNz7RJ5aq5tmAs81fNr YWAJvxwPlOfF390JtIQbdRgXpIe4oxjji1I+eVB8+IHwb7SykPkxHTj9p82Y8pJj//hu 1lc7r2RqWC1iCxqLSSNMFZKYiRbks18zd41dhgfX82nFZojtfAgK/vCNAVqOclCcfArW CJFA== 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=xnvIv8TIXFUlsrJkBzVtSX8K61yU1cn5+Sfo4YMMqrI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CpIPUu5c0tGS+D7Hz/E3Oc9yZndU8OfuWlw/CPXW20ODbcWzwKjoZh2iCJOrMOgRVB R0RncoUk3NIFWdZeJqTYgYQGuW4g5Kws2yyOnN0kHlYZNIw1uFrvQ1FML7gQpZ/2okW/ Lijg6WtEvvTRtDwAKJ2NpJ0/4KwPdCSQkl/Aly3t0F93TWWslI9FMBXbzrdGRN2l/T2Z z53jphNWd7n1F4OB48E7ThaCEOttMEboCe2HVlTbEL4r6dXL799R666az5V8lfKiGSbe i5P+eLxHxHlkwRF3UEqioJVQc7wuQW4SLVcNl+DPxNmDQ4QXcFTLnejuqa4EMgrxHHt7 OsxQ==; 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=J4lVsKws; 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 a640c23a62f3a-a9911107160si201921666b.1033.2024.10.04.02.39.17; Fri, 04 Oct 2024 02:39:18 -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=J4lVsKws; 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 4800468DB35; Fri, 4 Oct 2024 11:43:07 +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 2AF8768DA00 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=J4lVsKws; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 582364E1E 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 Vonnvj1MF5EC 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=ROX9cn/RwBhlW34E+4wgArMUPHHc2Yl4OUkqMKRN6/c=; h=From:To:Subject:Date:In-Reply-To:References:From; b=J4lVsKwss747IypPN7D2FwM2IRHJf4h6NCPt7fZ1+s96woYnYVejy9HzTwC+FnNnE vhHOQCn1hGgUYr5vU9l5Ol65/Dda3G3GOI8lvwvO2iE5QrRoYSOLJzgfFUBX/sYMmy mv01eS57J5SHxt3pFNT0YtBHxSgslRC9EJhfmp8EXV+i1hogb705/OV8/xkAJ7+DNW m8x6qdabhZXiN5uMX4u5xdyvXhKrijkEaYw8xvNJPEE2m8oXB4TfK0cyX82UwpH1jR inccsk2+9ll+OZrhBNwlMK+F2bSq1qTbBou4xIvoOcWvhNZNlEHzjfhbA4cw730/vz UT5Nunooq576Q== 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 26F714E2B 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 1B7E43A0139 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:24 +0200 Message-ID: <20241004084230.27419-14-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 14/20] lavfi/vf_feedback: 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: 5VLYzFiiuOCZ --- libavfilter/vf_feedback.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_feedback.c b/libavfilter/vf_feedback.c index ddc53cad27..0b701ed9ea 100644 --- a/libavfilter/vf_feedback.c +++ b/libavfilter/vf_feedback.c @@ -106,11 +106,14 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(0, AV_PIX_FMT_FLAG_BITSTREAM | - AV_PIX_FMT_FLAG_HWACCEL | - AV_PIX_FMT_FLAG_PAL)); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, + ff_formats_pixdesc_filter(0, AV_PIX_FMT_FLAG_BITSTREAM | + AV_PIX_FMT_FLAG_HWACCEL | + AV_PIX_FMT_FLAG_PAL)); } static int activate(AVFilterContext *ctx) @@ -332,7 +335,7 @@ const AVFilter ff_vf_feedback = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = ff_filter_process_command, };