From patchwork Thu Sep 30 13:39:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30828 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411847yba; Thu, 30 Sep 2021 06:49:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxClXKftsymSsJ+Y6AFZ3S877OKFzPBMSGr2UoXZquOu0cAtZcJqOz30ewlgK2Fu1RuESrX X-Received: by 2002:a05:6402:484:: with SMTP id k4mr7310900edv.303.1633009780931; Thu, 30 Sep 2021 06:49:40 -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 d12si3385007edx.556.2021.09.30.06.49.40; Thu, 30 Sep 2021 06:49:40 -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=rtCKB3mm; 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 EA9BC68AB00; Thu, 30 Sep 2021 16:45:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069102.outbound.protection.outlook.com [40.92.69.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D96C68A852 for ; Thu, 30 Sep 2021 16:45:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aoze30gz+b+UU79rKLqACVnQI9B85luw8VA1vO7tk1agXbbeCsf6lmNERFw2OVH0D3FwNJU3Q60tfcjVycc/Mz08RW/yj8VFX43ODda1k3gWTuapA7wDnCzJYuwLvlLpT4IPrNvxQtji5d4L9pig/mznkpDlpbVrXYor8fFieFi/Yh9Iw9B3G69zrKQ8Nx+pMkzlCa4sCgyCCE1C5oYdzdIneaPBIM2OL3TGPls6JWTDh6waHSuGbG2yJ1JKeAsPOE/mtPlNpDEpzhHIS7Mz7ypKpw8fk9K7qDIkqI4SNWsh+FTmXPeAyLNMmcjHGdp+aMzT+6BLxEnt2792gMO56g== 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=FP2ngn0/e9p+Rtab/w0LROBFog/ppvM0EyQcEGtlPuQ=; b=MdJNMjZNG4+RkX4vK9jlfvtODlj5033VFN98m0xmsG7nWiEjeHY5QdlKLPieYPtWFAaivTJKABFqDol498JQTEAtAw60x//HSAMgSvuCnlwYTCqCA4lT6BgGovPcjZb4PQ4sSeGFO1WOg0E0KnbC/c+eKUfTmh4oid1nB4U9fQbMjrTF0SPt8ivcCkFUvlJsr+YKSoKbO/QgiDU35gKynwMzBEwCI2x0QtcrqgAMda8NZFXGf8AW+XiSPPekMSoobfZ5dusum8UTUHSIv43ZARYl6l/9F897WXO+1+hwD4+isVTR8XmDfMnTHJZ6GlBOfiTULrkqFf+Viv2O6x0D3Q== 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=FP2ngn0/e9p+Rtab/w0LROBFog/ppvM0EyQcEGtlPuQ=; b=rtCKB3mmmuTiRN0qRMPzQvUJwJEaiyyQgKoBUrey6l2CUnIjxJECOUBXDKUhrIOswWzZr4O/8jn+1G98K/JCmvti4aUW3fjsFggHfJUA9E8rBIdpga/ovH8fneQujMpUlFzlzyvLeA8QbRPsLGygYk7HP4NwdtGiVfO5kGFdKM0IThTuL7uMWZ00z+GzDWU45QylOFy8MzHTUxB4/rs03fd0cjaztSCAtKzFB5yn7z9MrVZ1vKOPQjbKhZ870Igsw2ZicjkKhetvtQPOSEr0ZJQ3fNSx+i2WOISFAQ/e5bY9UzPhNR0bmsPyiTpS+kiSQ5efn9fVv9F6KJpWHRDvrQ== 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KPdSpCetaqQ6zRVmcplJDxtafH1or1B4] 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-33-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0a734a0-8b60-4e1f-dcb7-08d984188150 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8agbFzoe/T7O952dVRNurv3id480x8dv0YymVb4Rd9bWDgO/ciP3e4eIi3wuUIxl0l2mcJ8E7remtyOTs3GB5rAm0ZvtvHHyoaz/wvIh3QO0w7VxTnVh1kpreAF3+Dd8axxkvtFvV2/nh4B0KNuNh8Y6CRqk04sepnB413u1iIa1OfgR5lU4mUJRnMAWaQRasWqifyv/G7kcWws+ZfQGwN+Xt0h4fs2dFLiTTdIkSZ2V9E4tOjDy7q7HshdGNohRS9e2q2NW0tNogj4r/BiQlGbLI+ocScbZD63Fc00E8CnHzppAepMWQINHU5ZDC3Mugn2oCgI6GEW5lEO9cgg3z8HcoXrO1uqPyL5ydluv/WHywbGOocHxw+ZidaBwQpbAPAxh1pkiBGvcxHrHCiltNzS3yXHOc0xHPjsnnQXHrNUtVBhjpWNjHMnT6ycjV4nNBV4VjUFiwtVr5kfM+9Z3oltzUdEwwC1WCPBJcUzR5leFh0Bh/7Y8MJVlOv6g/UUMCRpL2rwlItre7Ql/ZMJsNB+AH7QzI2gBUk9uZLnEeDVJtXe+uZfrhZuWMrwrc6V7nke0NzlFK2WQCCrFq9W2FqNcpxD5ftl6fwKMP+HSeDYrJDS6cS2CHHr69vSfqKyQsf5Y= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1PUXkDldFaXFU+/bC79JbWrw/ASSulL0yF5lJ+r/mDFX9TiYN2bSWYtY6pbuBkptW7nTGyu82ePPuuLz5a4AFjKjToJ69cfWCLQ3MBcbm4XgOh7hs8flQkR1SZJrFz3lBkG6g9Uejow1dc1S6hsXHkkJb+lFoWQfxD3b7kuS9D0aA8SjQR42TkK7do+UozJIlSQR4+Q2ab9uFAedwMn8V+I+Dd+YXq50dNJMFEh2WK3ClAtqC7Z1jNerIaSru7U2JmpzaMNYHlwj5wNTcsInPld8ihrgqcKCiwcPoRUrHchUeWfPSi3iwtaYSckr/WaQKHw17rWoEQ6MDXwoZ9r532/ym39ZKvZycc5MZx3cl6QOZjtlM3JhxDiVq4YoSXO/md8W6KZjDWtVHglfzpMJxevskvDkbCzPjmQIeWoXJK+mFqc1Kb7tVLE/rJQgZUOc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e3XH8LRmj9tgevlTAI/lpNdMgDXP4khiqIqaT/oi7PLtA+rQqVh6YmxvwY/JvmOLaMDJF6Z5OkOdLdVkALIaxRUf2eAJKfSGsPehTwwdDwZfOxX3mPAT6af2RgZcp8edx5XcpSXpELD6BMxvNFskuQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0a734a0-8b60-4e1f-dcb7-08d984188150 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:03.5846 (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 034/218] avfilter/af_compand: 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: lum+v4MG7m7o Content-Length: 1457 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_compand.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 6eb68dfa19..2f8a580279 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -100,23 +100,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->delay_frame); } -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 *p; @@ -580,5 +563,5 @@ const AVFilter ff_af_compand = { .uninit = uninit, FILTER_INPUTS(compand_inputs), FILTER_OUTPUTS(compand_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), };