From patchwork Fri Oct 4 08:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp281615vqg; Fri, 4 Oct 2024 02:39:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqt3SPlbCAoHHY83gwTd1cHr7pWRHjRsm7TiGrFAwoPiOqPqsZw+fF7v8DHmJfPNO8PCr4JUQ/44C8VqyNbk7l@gmail.com X-Google-Smtp-Source: AGHT+IFOIsNl5QFyTNVdj/fntiKVNK/ayMOEi1xmZ4Tn1xlGXYebMlJ7ZcDIsBT6X5CuCOXbwTTA X-Received: by 2002:a05:6512:1193:b0:536:a68e:86f0 with SMTP id 2adb3069b0e04-539ab88c48dmr1246544e87.27.1728034746347; Fri, 04 Oct 2024 02:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728034746; cv=none; d=google.com; s=arc-20240605; b=Jm5sZh87TWYEDyBQ0BkLl9AVIu08Fup4QSAahOdE7OT2XMSVbrhmwVhIfUB3Pdkn2+ S3scCtBV2W2gZpjdvwp4kbIeALNb4+aHwcD3aPLDDRJ2kX+CL5yrRO74N9IR5s6CtAVK ryORP/guznvz2ZQekEWExvPt4V4ox2mtdmScy1lJHDADaiJq5kCiAjIeUlBhTZjlJqGc DGXnBFSUB/7oFfMzObwI+U4Kwafav25jkuQABxc/FwFEHzr1Jk+6z8Rp4YVbxPlkyXdm eZHvz8roCC+Crx8hdI70lBCSbyKl6xDWvKYaWmyQlT8Tgov5J3h3bgzVau98cFeNZG4v CN0w== 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=StplDUfHoxCmlZsNvSYp9Elqr6U/YfuA7wEZBgv12gE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aFZTy8WG0UZPOToLI/Av0Bx0E2QfPE7rjNDUHE0vh3mot2VPTpWr17ELaqguj6aQSy hx8UsLFt+XSD3udQ4QAjBsjfKWcs0/xy7ADPHvL1PBf7p5+j8U+Jc7M2T7U3R5s0v+m6 LPT5MOzek1gJdGnfb3du/0dF1V+IJIFvIVZ+enGf2RDFwkwPhujYJFlYT0jjHEWkbsXc oLFXcTAka6yxu3V29VVBD0FKD4Ew2aVnhStCk25rrVnLaz+7aJJqBBrnuNVf1hIpK1IW KpaAsrOSFBf45rW6yKaaHQnyjvdBve/np+Jx4Ys2VMQfB13jmAURKA1oOHLJaeQqjKBm JWGg==; 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=WvLr5wC7; 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-539a82a8796si1079881e87.521.2024.10.04.02.39.05; Fri, 04 Oct 2024 02:39: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=WvLr5wC7; 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 5B9BF68DBEE; Fri, 4 Oct 2024 11:43:20 +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 C1C4D68DB0F for ; Fri, 4 Oct 2024 11:42:56 +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=WvLr5wC7; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EE86F4E18 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 Z9sLP4D3zgm0 for ; Fri, 4 Oct 2024 10:42:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031369; bh=52wSfO/Gb8PEi6J3F1PgbJktvU9/sosyn+jYK19iOcA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WvLr5wC77C0SweiPFntxNpjgGGjOqk5GxwerFloNbdpvIlz7+7+Z6Ypc1xA5W7uhW x45SagT0IHimdzfPyqaSzxWJTye+WWXRhr8aoEBgObcdzrw5nrvycLplLGNqVM2dpB Y9+OjlE0sLTgsCZcTqVmPIZrf25aCzLG3b3zupGZlmYqR6qgcqk5Y1o93TxV4a0pOO YyA6HbBkHAfABHjjF9OpAXQ99RpwDFttG/hkaJPE6DNrWPmwsGc4C2K4fqjP3boKZ1 dE7qLIm6ejOa07Ac6LSzqIXCEA2Yut+SIvcYCGEtdi8zUOcxenqKOcQYrLMa68R0uk MQL80nzNGt0jQ== 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 E469C4E1A 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 D8FFB3A0F41 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:19 +0200 Message-ID: <20241004084230.27419-9-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 09/20] lavfi/vf_detelecine: 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: AgnlsjOE3dd+ --- libavfilter/vf_detelecine.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c index 8eae7107c2..cc69194a19 100644 --- a/libavfilter/vf_detelecine.c +++ b/libavfilter/vf_detelecine.c @@ -122,13 +122,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_PAL | AV_PIX_FMT_FLAG_HWACCEL; - 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) @@ -377,5 +380,5 @@ const AVFilter ff_vf_detelecine = { .uninit = uninit, FILTER_INPUTS(detelecine_inputs), FILTER_OUTPUTS(detelecine_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), };