From patchwork Tue Sep 21 06:27:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137180iob; Mon, 20 Sep 2021 23:28:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXNnmINGsvIXJsLQs1exPlvmLPNziYmE3C6tvV4LcBOBbPOwhMEV5/Vm0xRjYWs0qW4RBW X-Received: by 2002:aa7:de14:: with SMTP id h20mr33636332edv.24.1632205721253; Mon, 20 Sep 2021 23:28:41 -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 di3si11468329ejc.490.2021.09.20.23.28.40; Mon, 20 Sep 2021 23:28:41 -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=pGlwRY+s; 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 7EAE268AFEF; Tue, 21 Sep 2021 09:28:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075079.outbound.protection.outlook.com [40.92.75.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3ACB68AF85 for ; Tue, 21 Sep 2021 09:28:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hdUqF0j7CJ0NEg/u2nnNOaw77I2eDPYaR/9lH7ZKUFCnBDVtsrpPe0b4i/LXwJ4ScIieWobJcgh8vvB10tiM6qC6ZKAaPfvkxLYhl+AeQ/ZxPJU+4xEJXEoBmkQgoBFvvEEl1GYzwglFrvtqiR73m4xkotlpmO7Ixvaa89wMe5Kf/boOPObmlQRFliefcQHyW++4GlvKKdnsUJ5yJItURSlOOrJswoxR90OwxF92YC3WzjdLFYjg9+po0O2J9EU3ULvusbNr5eRw9Lqsh/wmX2XVB3S6AMjBKHTejEP4YszewYUmArVyge6yGPbcjfwIooc7hlxk9yAUjKVNohqGsw== 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=YDvnMNQd8erPbhlyn5fVsI/ilZw8wZrVTYHHP9v87jo=; b=HAqadgnzphuP0u2/Uy7jEPz4+r94atRIENwFio3WxhIZtOCvCzNvjZEW9eCQx8UUrGA9xIqEngPcmyhNSguUNlglhHnKZQu5xHdLOn5eTB3juOotlfCnY54qO+jeSnxUNQvFMMc6LfGVnn4b7bwag+UCuB3JeW0lToZj8BoIQaEy906kDSJlJ3VAOfsJBPGPFHDrH5CgkdNNNkTU10+tYbzMyFJupX5Nq9AbSG5zjHSOtRVszzjdLV8PsOBfC1U2+3ewYyHPaDpbDbBTgi5ba/4JHSP5sESKiEVTuYGpnvol48jTvXT5zLB2Z2hAim/BQkKk9qqeQzD+VBJK0yOa5Q== 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=YDvnMNQd8erPbhlyn5fVsI/ilZw8wZrVTYHHP9v87jo=; b=pGlwRY+sRU3ST3D2g6RF5Fji5dZngRb0vqzs/tsaUs/TVlk2Do3tNS1OGORzja1UJjjOA68JguFtjzkI4FBzITEe6uBqrP7J35n95THZ2Gj5MDw62v3rwHy34/o5mwIoEcYGXRuwNYI7qYPQEt9hkg/mPOXsGg4A9zNedrcXVR3WbzVhUqYYPeKbdZcKkTSgC97QsEKea7zykrNEgiJdkNDxCAnQT4f1wlNa1bDejgKfSPyOQ9b8K2Mii2CmKYb1at/PYzeRL03LLFjrLqOTbqNojLnUdi/Bs7ib91sWU9RGtKMyNZD95Zxsn54VeLe2geUpeY4OTOSbHbj/pYZnXw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:28:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Tue, 21 Sep 2021 06:28:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vBgquYQSFSDYelyFMmWlT1Qz1su6EDZ7] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f58a06db-1166-421c-c0e7-08d97cc8ff3d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSy7CLvw+O4+XFQCoCHiXyqocXTCI6o47JcsXWDAgx5Dwv0lFRKBhYXk858MV3h5E3ZaS7gE0es2GLZk/SXCkLVMYX6e0BA6B0TtwgcXiW+0pYGncCstGxE/myJDq/I93pD0L6NsVZbGbuSZmWvCBQzvgRLnLWQL5Mg5YMVOkUMJyS7lgPr2anzuwAq1P6fxpw+oHJ9QAMCZ1MA+ASZly8DlEwqgyVG3PQeNQHJHLj/8X0GWaHRN9sqVV7Bg3jHmhNM6zuPiZ1Kt1X2cKiL5S+61IDRporaOyPiwfS7q1L8tlHIUs9RI85jwJGgNqddS88OI/Z7h+Rp0UvqtGh8ullxK+Bq13PISnLWH8+86J8q7ndE0Ve3WY/QHnozQwz+OdKEpov9CHmOdoeePyvMBB6jNqRJeAtaT5NgiJtD2HfISDtfSL53ZwyqWwYzS6FPgiZ0lb1Dc7g+g5JLQdQV+i+KdCiWHmYHZmXjOJcKgSbiPb1e2DbZBPLKjzE27Pcevt0R2Y+es4RGkHT/1jMF2gIywPunqNsdY9EsJ4fR1khG+2+coWi/JvaD85mjrl/i74zU6rk8PO41IBk6Ol4e5tp5bUkYoNb10I1w9W8ZdhTtQyMH2hIs9Nq1X1bo3KC4Y76UaIybskapthmbjfxV2vUgY0NUYj/p9/lpog1U+wzUL7jYRp06J5vTZioftbwkyF4dKGiQbcZnO4V+wqH6gqgvpK8OzSpZNCb2GsHtFH8RYs= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WKgZiIOX+ZnZm1eDRlK6t4Oi01Ew4f2dJzRjZAP0uV6CjfyM1TwYNdhQMg+aO4lJhAtt+1Cu1fvjgW1Y47zi2Q79LBn1+muvW0yMwF/66w61PPpjgSLGSNq/YRa5BEbOBB2bgUxfg3loJpVB1yj2ALZYKSvOweGX8RdclcIkrM6et65JNBtMOyufgldi+kcaIWxOSAkTNUMvo6txhV3YzDxrX3M0MbkiKvLX43sgWxV35vD7uERINvc6INAhLLLK6WRYw2XrhXFYqjK5kdInH/iBuPH0TcNd7pnTlHroIdCGuyuxegzxOYcH030kMiAQg4i54wLF99pCO9M1Rd/pHDqpn+7Ye4tqRVgkNvzO2y1lrjxOc9SHbWzooCG1Vt4k4TtNa4+/KypaMIkFv3TMAuYuz70ffzOZFSTrEL4xblJcVxbMdwdKA+msNkLMeMLl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hct9V00JqqftjwAriyQupXo7GfVLJrw41dvpFVLBHhSjTUHfkdlIarOF60WXMf+FRqFw1adz5amumwTVA9wwfbKc0C9YzUlv03LlW7yxgyAYHfTqWBDtzPR1gOQuuMlxX/4F1MQnGbq7EBaL/jjiAg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f58a06db-1166-421c-c0e7-08d97cc8ff3d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:16.9715 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 05/26] avfilter/af_amerge: Remove always-false samplerate check 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: bvXmiaydLyzs This filter uses ff_set_common_all_samplerates(). Also don't overwrite outlink->sample_rate in config_output; it is harmless, because it is overwritten with the value it already had, but it is an API violation. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amerge.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index d67e3d7e32..9c6da15a9f 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -151,17 +151,7 @@ static int config_output(AVFilterLink *outlink) AVBPrint bp; int i; - for (i = 1; i < s->nb_inputs; i++) { - if (ctx->inputs[i]->sample_rate != ctx->inputs[0]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in%d vs %d\n", - ctx->inputs[i]->sample_rate, i, ctx->inputs[0]->sample_rate); - return AVERROR(EINVAL); - } - } s->bps = av_get_bytes_per_sample(ctx->outputs[0]->format); - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);