From patchwork Tue Oct 1 10:54: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: 51964 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp192109vqv; Tue, 1 Oct 2024 04:21:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUeMpd8kCY1RInlrUy7/fEHO9LaFZM/TSVbxs/EbbCZdPAjLz2RQYY9tqwcZubRLX1NQJgxhma0bI6rG2vXOLmt@gmail.com X-Google-Smtp-Source: AGHT+IH3GsFxGAx6t1JXyOtdP4Bxw+z5MyQD5y+XOc7wVLI8AZU+WkkPTMfwJrZPGXFuEaIxPFPB X-Received: by 2002:a05:6512:6503:b0:539:88f7:d3cc with SMTP id 2adb3069b0e04-53988f7d737mr5684536e87.22.1727781677120; Tue, 01 Oct 2024 04:21:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727781677; cv=none; d=google.com; s=arc-20240605; b=G3Tms6+8s5Nj8oT48moICxA6mll5PA9HFqXRfGP9fbWr1OIw8OwaYGU3FVXANEy5Qu cDxTlmbVVIKxjt/PJ53Og18VZD+TzPn/PWfbRFWJPOeDsi76deLD0MaijzJDCj8zx/9s 3EFfte3H2sYReHHQHDru3IWkTjiY5rGmnM8vB/3mTYd7IhtqqeWNQQqrDAPsQJm8aHKu Ijud5UzH8H1OS8hJE/HS7Q2+WfuLAFiuTB7jg7ic5GY/HzTzZZ3SkCy76r64XyR9+SeZ Zi9nwiz+yzgIoVCzkKBXcQSNCh+RTWygE52xxXKN9Cix6NZHiYYIP+rFydgGv2Rs/2zj OI+g== 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=KH8IZGW7IPAb2IzueGgH/NA5jz9hraL6wYME9irHp6Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bBRl+pu4sTpSsXnhePUc3Zj60/4NWWOKqkH4YWVyNsCsamgF2D5yP71fIcuvB+bVQZ jfuiQZf/SfFz6KtiyhtiDS3D44MfkXOubdahQ2CiARlCiUSMaHMD5+SR5n5+QCIjwM99 BJ7GIQTAL9KUAkJ1HGTPzglL6vcgnoDmMa0sm9tXA5NnJNqMehlfzARmXLlL+enr9lF7 iPFXUXiHSCT8nhKezI6R3O0lGavtors2YAlvDYv0rWqHgJf9xFQ/557dlAbl9pZq4NmT Y4flnUgpzibXMw8FOzh3TKYAIfRaoKN7SbmdTIUy5IrFfrtcLN+zkxJbBfmPd1TyCtJu oHqQ==; 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=cmJYpwrV; 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-538a043ac51si3385686e87.366.2024.10.01.04.21.16; Tue, 01 Oct 2024 04:21:17 -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=cmJYpwrV; 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 AD15A68DB32; Tue, 1 Oct 2024 13:54:46 +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 BB34C68DB7C for ; Tue, 1 Oct 2024 13:54:39 +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=cmJYpwrV; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 14C42EE9 for ; Tue, 1 Oct 2024 12:54:35 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 74Qwo6-iOk-l for ; Tue, 1 Oct 2024 12:54:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780072; bh=xWB+MiHxDhyxbjgYxZPnmf80GjLWeV0Azb9wu4Ly/2E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cmJYpwrVOjOkitZxDdReNkw1fhW22qbd2DlSKkBptNfzMSeVz/E0W/puDFFUtKvSn 82WajfklRVZl4MpkeO1yTVvhd90yucLl3SraabHwv23PsaN7e+3vY5pONE83/bcwr3 6N/Te7e8dLNLqNaB/HdOjPhyxzBMhjwNUvHEAlUzZBIEGG6dYMw5N2YvxeXrbpJAuX wJPggnKFzJNsixjCxeud4BB3DjpdZcmzoCacq8PpO4d2E4ZSNd5cfwAS2qbJto5oCY KOmsBZ7X1cqg+ScFDCqAEJcjTDTHiiCpU6aM0rW0Ki9TRHeVW5rodGwcylxl4A3YCe knBQp/k04VASQ== 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 D30854E11 for ; Tue, 1 Oct 2024 12:54:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2D81A3A2137 for ; Tue, 01 Oct 2024 12:54:26 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 12:54:15 +0200 Message-ID: <20241001105421.28967-10-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001105421.28967-1-anton@khirnov.net> References: <20241001105421.28967-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/16] lavfi/f_streamselect: drop useless query_formats() callback 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: uZYZ4voF+3FY It achieves the same effect as ff_default_query_formats(), which gets called implicitly. --- libavfilter/f_streamselect.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 4ff4e856ea..2afd22d4a3 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -296,31 +296,10 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); } -static int query_formats(AVFilterContext *ctx) -{ - AVFilterFormats *formats; - int ret, i; - - for (i = 0; i < ctx->nb_inputs; i++) { - formats = ff_all_formats(ctx->inputs[i]->type); - if ((ret = ff_set_common_formats(ctx, formats)) < 0) - return ret; - - if (ctx->inputs[i]->type == AVMEDIA_TYPE_AUDIO) { - if ((ret = ff_set_common_all_samplerates (ctx)) < 0 || - (ret = ff_set_common_all_channel_counts(ctx)) < 0) - return ret; - } - } - - return 0; -} - const AVFilter ff_vf_streamselect = { .name = "streamselect", .description = NULL_IF_CONFIG_SMALL("Select video streams"), .init = init, - FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .uninit = uninit, .activate = activate, @@ -334,7 +313,6 @@ const AVFilter ff_af_astreamselect = { .description = NULL_IF_CONFIG_SMALL("Select audio streams"), .priv_class = &streamselect_class, .init = init, - FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .uninit = uninit, .activate = activate,