From patchwork Sun Sep 18 20:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858709pzh; Sun, 18 Sep 2022 13:28:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+COFOXNwunNVmIgy17UyJ2tArIvFFGnxlgF4+8R2RCVbv/OvW0pKWx0Qk9ajsqOsqrxpY X-Received: by 2002:a05:6402:4305:b0:451:7b78:f2e0 with SMTP id m5-20020a056402430500b004517b78f2e0mr13263898edc.342.1663532938479; Sun, 18 Sep 2022 13:28:58 -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 l27-20020a50d6db000000b00446f6e9c6cesi7605411edj.351.2022.09.18.13.28.57; Sun, 18 Sep 2022 13:28:58 -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=LrSJDtME; 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 29D2468BBEE; Sun, 18 Sep 2022 23:28:27 +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 A7FB368BBD5 for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dlaZMF90EkcIaoI2uBuIPa70pRI0lZ2iL8r/1zzXlC6yRNVrk06BeK4erB5Vpjn57Da/2EVHSZWZlD6EHgiViC0NQ8PZDimYmyorVT8kHUdJRWdeNZM0KakJHSbNRDFZ/IburzXaPLtwHHlzPKqQCAWiWH+9mMFXHou2dbGdY+/cjV0MJdsIwiAK3PQIHFGjzp6nzQjBdrb0p7zMLh+pqZcHF2/XB8u44GUj51zW+mQ+wv3vO592LiqVV3RbjmEC0aR9iMY3R1gSPY+5rXPGZWLxvn0ORHK2qJoxCDc5+eOP3TqiwlpJQ1EIlW61Mv+utyZ2cQXQIOMbkrjQN+aEHA== 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=XqeBBGl9hkjPnY63TA9OrdtFmh8w3PEcryZ6Pw4w/V8=; b=WOcxhSdqJoCPyR8sHEEl+/zcrTO7/vsDZPERl3BPjdLjFDXb7DpdMcCN+KjlkhUvyen1BTo3STvIMIjmzk5SyevLF0eaLPK+TVSvyRMuMSnLP52Ts0X0NZ0poxqU9xly0qE5OTzzi9GDbCA0IzcwBVnzpoddg7uGG+o+2tfjQ8YsmKf71vvKK7R/7n17M8PAvhVUvpGDrUJ5QnxffhuE82W79lW/9D7HCbGWPjlCqY3ijpVYzMvJzQwQxvXlwIXMeoebAr+VEooYeCg8hr5Knvx0jwhoL1KljAEs8HeG/LeH095Tmvk4z6iJKN4QczeliSU9xzDs9YQ5tz5HN9ViwQ== 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=XqeBBGl9hkjPnY63TA9OrdtFmh8w3PEcryZ6Pw4w/V8=; b=LrSJDtME7ElyAxW29Xd+bCmKisELrMpsZ4WUKzdHKpWIXLkKHIxgTzokkb33KTauhKog4Iro5ffCRaMKlr3SMREV5wAmpZupfeR1GU6XEt9nSltqrqHJVF+wbu+wDSrC6KQslahdtAvQL2NZ1kjGtv+8bmLAhZTF58SP+GvJhMPq3qfu8FX/377oGcA111dfbuDcXdGCBOxpqijE5reJqUfh4yjOvvzDA/OCAHAdP1KdkfG9+xr6giDNQB4U21z7lW/K7B1VTpPfy4OsVLIUzqk9kuoPx2OlF/G2fVifz/scvychOWv2+1RrZfIML9jpKw8Hwbccymv2WYeFIifQFA== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RmnSncfw+ig+/izN/SqwUtjpVsE+bcm6sIUqEQaQCio=] 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-7-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: 14b9de1c-658e-4056-8421-08da99b44fd3 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYvdF/ozw2UQMeWp0drotB2snYp47qoNOX0MFzzzM6lx8++uGrj4kZAeoh56s/2WJHSTTRs3PSA2v6X64mEOrXMDLy3cP6ehK1eRIWO7oG/ly/Ug/e6unDWuLp9dYTf0MIrYNUG7WaXtMIpOOutYjoC0KvCuogbADW8IoQ1rU/N/An+GLgZX8oCmKrXlkZkV+YgKnO1jgzkOzekbWbcEUwslnP+LbkreWomdvlC6y0aHfeeLbRcbGemQIr5z2pvbFxdETiHC0WY1NKf8mi0lt2DB/698dNZRZXZSlyeD3o4mwTsKpJe/Q8ti/BYGksszYIyVD6fUOi/YaVmZujhbW29AN9ll1hi/p2kC3ef8PnigISGriFrFIwlhaxYqlzPGc7/dp+qcf8yHCX8ms09A8eDKEm6G4/uAXZ6RfGd9/E6yPR2uq94sJB88r1f+35YGiKcbuO9Zgzop9C5nqV3MJl9px3Npi8jFjvGz5JpHKtNrvaX7zHsW79uGM3rcUKu2EvopF8g/sL10LbWecGFHJYY/X6JTmcPbglbuRZWNPfeUKEK4iIzw7oZrGED+/NClFEQxv2lQzm5sqYqW5pbYxxYaXb3tR6Pplty1HswpYG7sPsIUnFWOXEUKH+dTfg8XV/aW8KSC3Tb6Vxeq+4Uy5el79M1hd8DV9ZPxm2zuYr0la3ZGNzhNcM0TYBdvq3TSpVBYAS0SReprdI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rp2r4/Vy8P/lUwWf/AfG7k/jfYEZg6UFqbnZObXnaj4LQ7KgEtsp5+eOExpmOFnbej/65hqC5Gn6qRB5VQnEeJYzgZqdlxzrW0aJbbeFAHPe2R0Z6s7Fx4PC4GSNmnvIK0NdecwNg8t4qUQ4R18GntPrMAcASOit+viRJy2PvD2WsqNNfagQ8VKcVsInZM5V7ku8KXXNLvKP/WjM+q4GDyCnBg/vxE33wQqtgi6jFV9KaHaAdPXbwK8H7rjyp6cUvsagyHqJ1m5r3AGixLbjbR7vYdzrx7hQALp5BZCBnL6EryngRXhe6qt2dB5m6eKAXzPgv1uFjujSn3aZaX4g2+5sJL+BmeDcUoCutw/7f7Sxajh4B+3jKd/r0IJcmhZw6ve9x6Mk++d4CbRA7l9bbUOYD3YHmSXcU+Qh2+3LS82UjSpODsxunwY1/TTRRbZ2SpiuMi+xTGzlUDYkDgKfTtEtlOrZ/4Y/0YbF9l2O/EUVc2RyYAxsCKHHqjvXvtWU4jVC9RFWKwVcckp14EOJH1QyzgLeBtU/7w31JPJZqdRGR7BRxzSbJilJE86UxnIrOp4O9LEacDy07tdgzXvNVyjl51u51ZTMSza55jNSkrcf3cZyN5Mo5wc0rAqkOyP3ISXRETvF4DdT0tLlDW3Y4g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T8wDX9dr3S3zQ/AUm/IaXEyWrwZ74SCk67jQaSKSONF0iar58TXB6vXPSJiB2ijkFpj486uCc+2Xjn8kYLnhxDQvWYDKNebtBN2R4DRDi1zBuv5ilHLwK+X00JSaP5XLVYgA0zpeBhc+42quyOPtDC2YbeBSGdW9o8CFjzbcPQjJ7T1U6Wdadsn5umcOD/hW4h4hJC72W/PfLrB0Ztf4Ap8u+bcs1k7wtFYlE6ac4sdO4AZ4ejiHMByMBhp03VADdkG+cWkSam2BHLtKLNeex3RH7oq2ZWGJAd89R4CRAxiE6pmKsuGDGSUGUsWiBg6df8QJlcJCiAGakphqKk69QTe0AodH5yEHin5GM6Slp9R0mNthS03g2iCykUXQ7WJQv1NH69eaP19gB0PuiS5rydKGIrKiDjVAQDzNDqgcAGOjaEYCreczRG9alzDylMqahmU0yS4y62Z7C0Mdj5+Sj9ZBuVsnB3A9tAOpqXL1e9n6710zETu5dzczMy+9JNJr61YLGPYh5ZPa59ZB/oCmsmTiaFCPvm/tntJ3bQgIEYyKVxfpnjm4jG4I74h39dDZtipu2iEi9JZ/MIUG4mLcpxup7lut5NQuxp9ZfE4WY2xeTSXelw4EFwYU4hzX5lOBdKFCGsgVd+4yN7UJSM+KgsbaWZr3Eb5owniXWePaDbNlYMJjKnvGXlT7JqV2PwB0ea39Lk0Mp3UzH/ncYPq4qy6lPkzwxxuxAxymPf/wHxuFnpHGMLL+FCqUcbWPt2Jg9ThNi/Eh8+RLZbvu5r9FF2Xft7+sIKwiO3x6rxGPrH3QGch8klXYG4END9qy8LhNB4G50OIhZPOLKRoOxN+xUzmfXpb+SVZIgJ9cIpAhxHVcqkyEy+CPxFYj9CYv47xVJ6SD9uBMIr9+tEB1S4TS3JMPlg2qnvkrAYN9Qvu+ASo6kjQZeFo0w130QGZY6GPube1ih65grH30kO2UGp9Sfk0LBm5uGkR+8rkppApdjYLJTZTeU0YyFR5RFXukw2qf+ZH/HnRXqcdAaJtD17P05NqHdyhLiapPGHBKH3KvzjA+ajbVMlB225ayVOtsEm8Wjw+xPFdOduhO4z5+LWV2drOteXWK4+3ZvovX1C/ATSkslJj0w5CQEUIU2Nih49mOwZqy3FuIr1A1MgxAl+pfVwOTUlB0i47jflg7u0qZOeFecnoAEKoK0N/pu0FZN2IUnS25cEI+0ENQklP60nO74Iq2XyOoAf+niQrCzzHcT1szctNzODG1f0BsiWWbeDJ4g+3RqIxyAP2xtYolsYqIldP0S5xObMB41JvOsxtGkR4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14b9de1c-658e-4056-8421-08da99b44fd3 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:14.1114 (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 08/17] avcodec/pcm: Remove always-false 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: mTf0WByy4lQQ None of the decoders here have the AV_CODEC_CAP_CHANNEL_CONF set, so that it is already checked generically that the number of channels is positive. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index fcb8ae1c2c..ee36a364c8 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -254,11 +254,6 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) AVFloatDSPContext *fdsp; int i; - if (avctx->ch_layout.nb_channels <= 0) { - av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n"); - return AVERROR(EINVAL); - } - switch (avctx->codec_id) { case AV_CODEC_ID_PCM_ALAW: for (i = 0; i < 256; i++)