From patchwork Sun Sep 18 20:27:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858874pzh; Sun, 18 Sep 2022 13:29:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52YKRHo1WuaUZLwoKKnbMB5uXXdA4CcgnOPIWxiBM894Mf48lPtdPSQptF8azJGuLXR5CR X-Received: by 2002:a05:6402:a43:b0:44e:cf0a:5e82 with SMTP id bt3-20020a0564020a4300b0044ecf0a5e82mr12423281edb.118.1663532973260; Sun, 18 Sep 2022 13:29:33 -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 jv1-20020a170907768100b007417040d1c5si18143078ejc.823.2022.09.18.13.29.32; Sun, 18 Sep 2022 13:29:33 -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=iLzcPFUK; 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 6F64468BC4B; Sun, 18 Sep 2022 23:28:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A44168BBD3 for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8tzHKpnJK5h1ZkiaJLFYYHCVpu5TbNXb9hCwlPmO0H7AhBCRfIxT4F4tFRoZ7pJHvCZFxY2Mx3wet7M83sq6cG86e8IVypRjIhRMklg2lHdggfazLdSkXFjQGG929MLa9SI5Qkdtdj2ysP6jj5fRYLdRx8Ni6Vh90iBmWf4UxIeafIfMfXeO5JdQQc4A4n9Z7Cyf5IiCE1c6WVoftET7LUrIMFBoUaT7dqdoME8uk0gDe2q5mcv4Y1OiEs7jxhkidXazSizF3gdWtp/9vMllRWWgoAJBpcxKLefdwzwWf0X1oe1xYNpLscd0k1Kwp5nbsE0KagCVZMOIglKG11zlQ== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sxQ82+MZ/TyoNEgufVVnLjjncuyvFgDOetXQ1wMbxDE=; b=S4e1vkcJJkFBSAmPCK6MrCL2JeLnjY6NJCQ9DjqeTSVp5pmX/Lnwy+Admg66CRT51GA9QskpxM69MbLu0y179fs80iuu5kf8lgUC9ym0ecuZEch6YBMvDJYK109hkBE619d6JCHuErhtrEkQaesm3/hP0zsBW9Pi2rWt9R9LatawckWOEPvv7Fgd8QWuE3EjEdg1+w8PDaCEPLon15YW3t9UJmGOM38l6VpdEm26RKa6+TY12e7xDQw7DaIbTqWfbS3lFLJay9NxDl7HH6mJuuyaRBEaZutUdSJdSBEdXJHuh68T9Ud/BYCitYGTQtfAIAkiAV9fWzzvBpr1w/wZDA== 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=sxQ82+MZ/TyoNEgufVVnLjjncuyvFgDOetXQ1wMbxDE=; b=iLzcPFUK7FF0nxuHfk4XNEwwyhu4uOSvZQTnh7goEcHNhCFyG1nRXARiLZLDN2P3eyo8il8sko2TIl99hbmdDyM5IWAPe6qii17CIcsajE5UQlmVwlD57Qvk9/AQOEdGnKtDw0c1wrFGQKNbFWqM/YaQz35qekPdO64/59dNX48dsp5tLbfd7jdClk464KrOlFsXndI+Fu8qWHCRLt5G7vDvCRVKY7v3j3XzDjEwHNlmyjXX0czhWYmch90ti8RNGnmT0S/TD/exUTAKV1Ioxp0k9VjYWcVTVvGdryqVSou+d1KSAtkDXFVB9KWwZ+K7IKav0pE7B0wEzNXRu5z/vQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0484.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Sun, 18 Sep 2022 20:28:19 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%7]) with mapi id 15.20.5632.019; Sun, 18 Sep 2022 20:28:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3/xrpPWxJJNicELGZH9+ShAyOvDJhVw2MEW7tMcCbVg=] X-ClientProxiedBy: ZR0P278CA0109.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918202757.2345415-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0484:EE_ X-MS-Office365-Filtering-Correlation-Id: 28eb8018-7808-4d40-eaf1-08da99b452c7 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHUuMaJpkr7jshQhQ+SoZAyRoiKZn4e+iVtOBusgiqcFN5QMomhuEOKvepzyBLr8g7M6vfkiEbhFUbeRbzHf3Byz1cg85XUa0P206B67asMo1eq148RcHkFtrTY404ZouhzEvPzzhkL8A1V5VKuHRBhB+Qf8dQCRvEDJ5Wm5HuLWC34qX4XfN93OplCajtYLCu/DnoYUi6299+Vajbd2z4i2IO36NNrJkcxBKQEm8vrf2q7aTGmzkV5Gc6mGcHvi8GsDzT9F6wRKRLPYnUtGd70cuVnQbJ3AKSXM31Q9eYelIOZ+Mh+M1Z3Sc/CmT35dNYF6/anKxJNnz2ABlckSz7nicAdVaUI3mmneY5GNToPWxhVNBe6baP6DPbNegiOwQiEjZTpN/grFiCSX9fOdBhzs21Us9DNTeMcyKTKZZEfDoseJBjEauFFGJjY6J+jNEhkHp2tf+91ndTqqgVoXhuKis6HHBAR1VSY+hYBk1E2TM3Yy4HL9HbO277v6gfJj7MJhNMFrBgmYVUm3rXdT9j8Ur23vmh1mpaC9Fg5Uf5Tr9xyot9knSkWmBHB6zArt4GuWFqeTvxzoxyqagmYcQlEpVjE+w63ZMRjZuOUh6t7/WqC8nIHsowAAUQ5B0bk2tsaCd6HbuAL6DShlFIwpnMN0JV6LUsukj2a8k0DO9O7+X2qmWoxo4S0A+Va5t1sQhkbzm6fXZefZxQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MOECWO5Z/QCAuN/6aBpmTkqdKLpgS4EY132Br/Ors0xYYxXcvzkLahsJTvT1mi2A+hcfMEH0Yt0VKNVnSsSK0hQ95lVnW5YphMhZns/Wj07YKqx6DNDACpgH762++CAjxa5ELA1eeGNX8pj+PCu1w2CtcoRGxvGXrKdkRs3C8QwjYSSkWEj8L6v0V6D9FD+WI0kEFgSHeiOt8gAnZe4IfIOKuhXabGIN6fqcAY+EOIahbxDc2wCJYGsE+Wwm0e09qLME5TtB6TeR0+r7oFzyyftvsnzedRbV/3Dg4MinqD6KlLwGUVX3t4Dh3xLxrMQMjFBa3IAPYHZkFLNQvnGDPEsp/KpIm64exiq9n0IBTkw42gjvq0iOZ/uWm7yPayeO8q5qnxYC/kZHrXHPPejr1KcSo14now1e/B/cJs/S2wJeSW20z5SBAyI4n6aobxrDcvPdj3cD8W2a02ok9dg1nH0h7TynSF3LTIAiDu9gKDWA7A2ql0htVIbOXW3NIjYpk+Chbm4zfEzCWif+6NU/a3w3xamDeatKeKuBBMbpKu9Mkpfuy9KArB8t0MVvNOvfLWX3NU36vxgZesxZsr2GJh0Z+WrXKaiapyTa4soPSOeN7+pYNPL/bgRJX1mdKYgQBUZVqviXqRJUu10A4epYxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HSRXzs7/uqwAUquBM2jxP1u1l+SJVg7Lg7vElJXPAAjQzZ0ZWTT1X3bRprNB6zeNTEPMh1eqlIWCY/mBFd+XpH7ugO+i8mtehT6ETkC4jOyaY70qg6oVTbG11N3q2nKp6OUPJpbJZh8zOUhzvvySjxy+a4ENOOoAvBg9uKu0FhfNyqJWbD2Hb8zm922Sob7MAjATm4JLQeUCYBunpFSq5y0WY26tUx7mpbKV2Br8j0Xw9NE+dJnegDmTADH0tiM659N7LwgW07K7s9498RJBm6x2+4STPmMxE+eDY/+Y+E2ceK65Bp0l5D6cY2v2q5/JsEnTDu304/cLQw7wcRcPMTxQmMEW9MuyFO4fjRXV81Dh4yJJ5o4PFFzLCesuTxTT0x3XJk0YthY3G8sPvK+hrQ2qh8g+aIqhsuRjS9jyyake5fLIUqjUDvKxLUvgDFKLmA7WxX2Ew/iX9rXT/NxGBCHL1WuUQTsWvIRHb1D2J3fdliA/um+VN4irS9d4+LcEimROtgw5ef7sBHsLnBTsaBn5oNz2scLGjnX30RqPpb9MHQ0Cu4LM9w1WEOMtQQLJnt1llB/rpq1eaQEub3XG8+RMbplfe5MfHUVWOruV4VoN7Rd8/I8oQ8lhq36Q1qCab9Bc8/eVApvz6+sX826hMrld+ZzGdZCCRNAKhYg0OEG8qiOGFiRA6mI3g5QHNOr3Bv6UNZ/ABlD4eZLkP3iXoAIIWIC+hVi/5NV6DRi+pqcJViWKXc6rHQcvc5ZxwPuoEIX/9dVT6WW2Sv0tRLBhdPcsw9wMNiK+W+Dk9d1zG1ZhjcSSTRnM4JkLi5zTtyKxt7yLA0l8KEHJN3U4+4EjdAhJ6iRr94hrwNRLCLw/Ze/FtAL1NtkXplbjktP022t3Tp6ezgxgnO2qBH19ndogVlw/yLlDolRXl3b0czWpQKrLllKPAE/OWx1A8ZhnPtItPUE9YgbFtXL4gguGfAdMU7UpW/BlAko+bn/FjSgOBZHz+hkFf/WXcrIfrihYCexI0H9Rhiv3mO00QmFCp22nqucRYlOJ9iCoOZzkOzO6q+eUrOh7auFtlAKIxwcA7RBZqvwYa2AK0RGDpzl99kfQNLBQTjK/RzGTum0Cp2MiVFdi7lKG53qk+S0MVKVMfeCGLX+7N+ttxrfGK6bBTLqM1E3SxToVsnl/HyotasvsAGWliCD0C7AlQvP5bmAqzSLHGgHBRr0c++ZDxuPaUiK6Ha7u0I7a7wvm3EwkpuyWflmdZMUfWAzf6PP36aBLkm4EaBvebAalRpujFGbA6eagUOUK2QZtjSPJKWl4b+tAPi5SfBY25sgmbpXQh/XXK+A9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28eb8018-7808-4d40-eaf1-08da99b452c7 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 20:28:19.0686 (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: DU0P250MB0484 Subject: [FFmpeg-devel] [PATCH 12/17] avcodec/mpegaudioenc_template: Remove dead channel count 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: ixQxQDju2ChM The encoders using this have AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegaudioenc_template.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index 67b8069102..396e8a4899 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -82,10 +82,6 @@ static av_cold int MPA_encode_init(AVCodecContext *avctx) int i, v, table; float a; - if (channels <= 0 || channels > 2){ - av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed in mp2\n", channels); - return AVERROR(EINVAL); - } bitrate = bitrate / 1000; s->nb_channels = channels; avctx->frame_size = MPA_FRAME_SIZE;