From patchwork Fri Oct 4 08:42:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp281698vqg; Fri, 4 Oct 2024 02:39:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTXP9o66fXMjitX8RsAZW9PdB/0T2Ha/5ECAPBfglkeaWlB/WemF/keLMmW6mJk39L8u6akgzGcLw+VPeeECxp@gmail.com X-Google-Smtp-Source: AGHT+IFaqEpHessdJ3hMv5PART52PIsPOBUPaA5vhwoai6oYXXqSPDE9pBwHh6oSwvgmDcghKkBh X-Received: by 2002:a05:6512:3b82:b0:536:5534:912f with SMTP id 2adb3069b0e04-539ab8c1b54mr1087195e87.50.1728034758090; 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=C16+i+wmLnBlnI+7fYSTjC6DFu6YR7mGQSmAsLSzWgxyQd0fjtBKIO+OgYrmnjMZ3a jZN93CC+fWqmGDzlHEg9TaSCsgOCe6XY1lgy/PASvWPma1kDR8UIHaZdRhYs9ESjjYea 5HJYXkL26pUqW2AzfbTH5tu9lf0pKhxHAW+oJGjt1npvBe/U2fpBmZTxxDrvNHUW4dRr MNWY82L2KUfy5n5awKDV+2JQCTsFsNOLg34ZpCgfrm/B1t/G9WYiq1V1fpTl478a3fh0 DuOLiHJGdn0+j/IWUd6/RhrY1+9VjVPynmzhOZnoMgS8IaqTJadb2ibl5pfpYAwjruGY L3/A== 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=jIz8bYIphJOeJ6RLKdGwATEyIvEtmneXpY4Mgq8v+sU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LvWYrihKVrgKXuvaJn2iHAQJS5Img/UkSUomO5452eKJp1w3b68kVGo1CvLswwmm0N lKPfbyYukfOBiXL3yEb1F5TsmRqrE7M6D/tf1ItnFU2I4RDn9+R6l+rlez3qBZtCWW/+ FuwWy3YDCV4DZaAeXxp4dthFijS8sq/wvhfH9qOJciOC+15Fd1riB4ax5xg9Rmb6kOjV 2U0bBIk5+v3PPlY2FqfO9jpfXuAjBU48Ac9pwsfxSvXlLe4PcmKMuLWen8b50q4wzocP /dhffug+meYisLFsiJsyZEzALl03mr1X9BdvPOVjH7rfnemWzraDuUmY2TqzqsNAk4tO +GeA==; 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=GITXc8gZ; 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 2adb3069b0e04-539a82acf65si1104092e87.606.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=GITXc8gZ; 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 488AB68DB79; Fri, 4 Oct 2024 11:43:11 +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 4200B68DA5D 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=GITXc8gZ; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EA5E74E2A 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 l8Z1tkMdJ5Ya 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=Jr3letybn0Lkd7YhwSOGdOmPq6/+X9Cr26WHr1wdAaY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GITXc8gZLjrtqFfcQAAM9PeQYh7HdTmJTE5lr+/83rhGfkqrqUfeOX8MTmPIgqFJW lYOuFfascKP5rtx+zf8V5bD9rGw21bffLhWLImP/NES4yQINGWtgWAqbJWbV7wZ0oX A/Hp5XaHdMO7uk4T+ExKGovA4v7JB3BJ/IZWzmSUlLeQb5i+aOre41cnxxH7/dA7xw +sCQlrllGrrv2Pt4Ep/9MfsCMFUQOQaPfKJ3anyACMFhjyg1As1Pik3Lqfw/fWSL/b +f74WyVdrmQ5ni6zI2QubjMZTbAzsznNWtpr62xYL7lbnaYBpUoMrxZCKp6hWARKDQ 0oc0M3UbraPPA== 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 478264E2F 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 3BC933A1DFD 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:27 +0200 Message-ID: <20241004084230.27419-17-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 17/20] lavfi/vf_fieldorder: 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: A67WxdK6yfkb --- libavfilter/vf_fieldorder.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 46b7f4bb30..5b0c723e8d 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -38,7 +38,9 @@ typedef struct FieldOrderContext { int line_size[4]; ///< bytes of pixel data per line for each plane } FieldOrderContext; -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { const AVPixFmtDescriptor *desc = NULL; AVFilterFormats *formats; @@ -56,7 +58,7 @@ static int query_formats(AVFilterContext *ctx) (ret = ff_add_format(&formats, pix_fmt)) < 0) return ret; } - return ff_set_common_formats(ctx, formats); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, formats); } static int config_input(AVFilterLink *inlink) @@ -183,6 +185,6 @@ const AVFilter ff_vf_fieldorder = { .priv_class = &fieldorder_class, FILTER_INPUTS(avfilter_vf_fieldorder_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };