From patchwork Fri Oct 4 08:42:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp261602vqg; Fri, 4 Oct 2024 01:54:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUYshdEk9pSV1WIz2fAyn0bVh50l3tZKho+8hmzn9K/Xx0zbapMcHxSu2YMG/2YEEqi6Vy/4yQB+IKrPbqyeGZc@gmail.com X-Google-Smtp-Source: AGHT+IFq+cVNXFqSbdXpGAqb+iRvRy9x0DGW75z4uXFWgwncwoY2O6bXb45VAE/j7rzsnS8mjzQw X-Received: by 2002:a17:907:d17:b0:a86:80ef:4fe5 with SMTP id a640c23a62f3a-a991bfef9d5mr195487866b.47.1728032054278; Fri, 04 Oct 2024 01:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728032054; cv=none; d=google.com; s=arc-20240605; b=MY8wXKxY6CDOuIeeRUjcs7qz95TKh+9L6Q2WOsJ2oUfMt2zmjbLQvxm9ayIIsEXIT/ 1CU4TogGwCcaHudAYGn9wxrmSm4Dmq8zsadE6mMGH6I4FI+1rXvzTarQW9x4BFIhcGL3 jQPEUKmTElEBjl+gfXq42qbSAOeoQn512N3WogQwS2HXbMZdMzwt8CkyVjxCsniSBOHU IMfkQyz2W7+IYLZdx6sPlJMNckkT5Ugy0W88zWslDn+z23Z81FNX3CeJQuH2j+ivcP1+ 9gGY0Ak0JFfKt6FYEJD+RnFMu5Ue2tlco9G+YdwdqnYCfT/r2pUIN9hTtVl1Qa6qGllL idSA== 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=sAfkOiO7cMvAovvmEU5JeHeb5m+7CUJifkfsgnB/oVU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=TStKYzRThpI1v4TcJkMEomGvBOmUJzbfqf6oTCAku/SLKr8fxg8YP/BYW/yVuqvetK MpFoVgYVHzKujE3U9uro9Nv+3UNFtmxjJRW9lYSVgs3SNO+fYC+N9DiD+pIG8Lxaww3S WcCdANxbqsfhgafFG3tqwsTB36TKGkX/ppxyhKOSsgsg/Dnn+6m3AslGxi5VwdBIRH99 /DzS6GgZ+A8RJQ1bOS6YqDnwWht5R/HDmJLEs7VNKQ5I3iU5f7yFx4xPyif55RlXy81A PAoU4AYB1Xrg9T6rD18XDsNWy3+8NyHRf3ifW+5CKp2ANtzuiE4BLZ8VZovUXQhGIWq7 UKWg==; 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=KSxnvzH5; 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-a9911023fb0si191319466b.676.2024.10.04.01.54.13; Fri, 04 Oct 2024 01:54:14 -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=KSxnvzH5; 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 B590168DBBF; Fri, 4 Oct 2024 11:43:18 +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 7567468DB08 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=KSxnvzH5; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id A586C4E14 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 trRnYgYCCE7D 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=N1z8AV9KpLjbgbmpsVGjbwLfx/o9mg4/2V9/MclnZ8U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KSxnvzH5vK9sLF/lxFkt5K4j0tzwYLv6Xsu0VNE8oRsDtSZP6uzs2yGWVgigR6+xC pqhmcG7pzZgG+niMHrj8sSVx0j5utLMnSp/+1Xj2ZTg8+N1orEWmm/M9Zc4yHfU2v9 1kVDzkUDeWMx3tXzpHOEqyk5a1fdqlM0uWgqO1xZPDJWWdLXSNFp6ljfEZkMxOuUKB fX6MXR+5rVpSmxoT/0k6WrcLOETMY0fSJyT3gNA+NWXbVf75rNhd+1ez4CQeP1Jwdu FOZ+rW2uEb1Ot7yUDyL3YB9XkLn45+P+0W1a7HMa1GTwq8wETKHvY7uuzfVH22gL6O FyQHwMN6U/Sow== 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 C8C604E16 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 AD0EA3A1A81 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:15 +0200 Message-ID: <20241004084230.27419-5-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 05/20] lavfi/vf_copy: 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: pdLWHBFW+fFi --- libavfilter/vf_copy.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index 8158414dcf..87cb9e9bd2 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -28,9 +28,12 @@ #include "formats.h" #include "video.h" -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_HWACCEL)); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, + ff_formats_pixdesc_filter(0, AV_PIX_FMT_FLAG_HWACCEL)); } static int filter_frame(AVFilterLink *inlink, AVFrame *in) @@ -72,5 +75,5 @@ const AVFilter ff_vf_copy = { .flags = AVFILTER_FLAG_METADATA_ONLY, FILTER_INPUTS(avfilter_vf_copy_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), };