From patchwork Thu Sep 30 13:39:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30733 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690694iob; Thu, 30 Sep 2021 06:51:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznspVcNnNwroiHfgzSbfTpL0Oal9pYvJcazFRKzo9JDueSln2aa9SwN+bgtZ6T0Qlkt71Q X-Received: by 2002:a17:907:869e:: with SMTP id qa30mr7071754ejc.249.1633009862880; Thu, 30 Sep 2021 06:51:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr5si4905281ejc.602.2021.09.30.06.51.02; Thu, 30 Sep 2021 06:51:02 -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=@outlook.com header.s=selector1 header.b=BNrt7o0E; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E495468AC4D; Thu, 30 Sep 2021 16:45:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064060.outbound.protection.outlook.com [40.92.64.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D6C768A8DB for ; Thu, 30 Sep 2021 16:45:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BF5vKW97HukVaNEKPgU2t8wVo/JxttJPcjzzTTw6q9hzWlRsM7w48QFeBtb9dXWwb4WBGXamnndu3kqHsGZ3G5TlY/Jljvd3ENotN/qGu8e9H8Kla6cSSNuylXYR8LbFARSF0wyGMfYDzNQuC0oM04SO5oXbCNUX+3kG4r1K1OmLDs4xyephHiFL8QGNVKbpFk7Cq9BcTcX9pcgGNOM21C6mo5WvZmWjs+Y9aa0VLTSW5ITlterHbf/WBMCIGeLFPeaIHBTh3vm2z37su87Y1FlIPZg5CGsgtEFDufnpi/v4SYrSSXlkzSB0z407ypPLn0CBoKygrJZULieXpTJb+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uITTEBzjxuo/ftywlwSNE4ljD6OVyMB5uZ+NU+WmBvU=; b=SU+x91E4aHr2rUCAkX5qfvFIXEMGvw+t8k1aCzR02LwoWEBw3F3No9FPryrxQWVrkYoKxscZzHF/ifojnu+dduvD0K3zuuQH1xJGovNq2nb6sTSnUUO5f8pz/8mcOxPROWjd1ePP/2qy+cShAZdfVnMbBjH7/+ae+OQ3T1WT2RuxdzLc1PBMttrod5LSfXGAl97/EgTok9e7Q5D6ZDUzOOzjl1+X4LjW1iYfl6w+c8zyrXmYDT4o6TYRPtgEoLZXOPr6Dy8/lMvd7y9tdTkw3UTo/CT84FtJITlFwqJMIN9dAkDhvgGGZi2n1bZkMpKf+vHRqrqg3oZ6j1rFY/g9YQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uITTEBzjxuo/ftywlwSNE4ljD6OVyMB5uZ+NU+WmBvU=; b=BNrt7o0EhW1fjTktIynAO6Rdy1s/kPn1W4IyVdkSQrLwVjVSG3tuNk8NCn5wNg8VkFiMhhKlsOqtP5U4fdtrcPw8bdX2xVdyVf2I2cT3E0fjbacZ2aK/dFStYaGg5xNOwZG9OnYiPZBwSLsB3oUxCgjvkXkehVJCrQkSIyYmhLTfArpCSgCifIM4mKAArISSoGsQn9hORUIZIfuDR9+WjSsOvzou1vxzOGmYH3m5boyQAN9FgrNn6bPdlS6e6Kh0rzA10fWId/G+D9YIz4z2fACiIBadu1cn6VmvZKcLDFVA9HT/RXfr9AixEz8aD7AbiQ5jhzejPcjhZcWVyVvPOw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 13:45:30 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:45:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ne+NiVVPILXYl2wc8lEXmt2MN5ak+AWy] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:45:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa291fbe-a85d-4add-3a3e-08d98418917c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8agYWrtYlpVMjBq36yuYwBYp3nIsOQTvPUs0B9Eyr+bW+rTxx1j1J1PAYLAuovrIzjrUEIdHIdO4/8qgIX3ylzQQmrfluK+/T5XK0ZDhqXcFViIhxP+79hZcNCW4VBuGrbCQX5oDP208b6MLUQT+iPpKGXfZxR6QgKrkUpBvJzsXRkd8/z8Zdy0GuJuTYrUhoNJOSEVdEtSHsSRZSwMbAgadSVK9M+ve7/y0MF+Ow7FKdzY3dwlQEmv5Hu7jFQ39sFlfTiVrEkqSWuvbHuFw9t4gweu2bZdGDoKDYwI+ZKZstJvfWcDnsVqRiY9sCmgLbNJEQU7oS/oDxHrKDXUPxnUVXbh0ZiYJP5qBY+DlsIuKD7pm+j1ZoHZYZ7Gz4nzNihv8jYSckd58XJPxGlzJVm+jzhamxNBiVMS3uIZ8chOcAYrhlZrTSR7TVlX5SkH40JLdHxAZS77KDMB4HRlGL7dStfToICohOYZlvI3GZUPsuX/DKhjt7nOGRV5iYUrx1w9CJH2Q3EWxZJzDNWQTLL2c1cEIEaWOZXj6lh+EtbE3/Nh2mIW66PNjIgfVHdZBtoS/Jv2cTM3NN45OrYDsNe+Jsr8lT9/XcGEVLsdarlnbt7KUx6yhww/A5NBCy/u5oFhQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R4gMNowafbT0lqrGRgT1HC0vaaZPcCDXvL5M70AU7NbVxllvLth8UmEwt5EFlMyzLpPQhDYIomfjUh9+nysXjdQufvANtXgJlsrLmW7NI/bHBgToii6XQ7+Y0cEsP4AaCz9k5y20h9fsFemKPLCWqpreXnoGz+MFajEhT014olS0ONDLggyYFgqgzbZK6VJ6NscNF2bhZXUXcntkh2psjCMNpYOQlXBtMZMC8M/NOpXX/oXsFtG/rRgavj1smPvKiFwIXY8oLS6rZX2kjAzfJ389jSX8+83tinCMXiEgvcC2GjKXhZ9PqDbhK3zb81UVBTwKVrrv5nuheZLZfYIpsT3zQtPbgllFxrcCHgX6Lvx855az+NcFfgfBUiZt5FyFG4l7FqkjK8VEL5wGGEJk1CJpl5/tb9dR70+cNqExDthDK+T73I4HdTjpyWskB4Wp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tIx25WArDjvYyqdsZ+xuXQ6qL9heHeWKn7NEBfoRNpsD0nLL4Rzc7XXXd8+DQAVAEOgzPpN6Nxa4l/yB1pi/9lTAIUQ/WJ20EK2ls8BNyWQO5mkVqlGU5NBBEqCb/lqLfV0ba+rk32/Clrkox+XDnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa291fbe-a85d-4add-3a3e-08d98418917c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:45:30.7103 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 041/218] avfilter/af_mcompand: Store format in filter, remove query function 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cLZquIfhn5ox Signed-off-by: Andreas Rheinhardt --- libavfilter/af_mcompand.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index 5b689caa49..90cfda38c9 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -122,23 +122,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->bands); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void count_items(char *item_str, int *nb_items, char delimiter) { char *p; @@ -659,5 +642,5 @@ const AVFilter ff_af_mcompand = { .uninit = uninit, FILTER_INPUTS(mcompand_inputs), FILTER_OUTPUTS(mcompand_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), };