From patchwork Sun Sep 18 20:27:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858787pzh; Sun, 18 Sep 2022 13:29:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lQUZrevTFIM5SwrwUlJq3IzpkAlOJmtpmlA2TTP9QI3UXZrVPAzG+uFkWhZELvyRssFCN X-Received: by 2002:a05:6402:5106:b0:451:787c:9fcc with SMTP id m6-20020a056402510600b00451787c9fccmr12510806edd.164.1663532955735; Sun, 18 Sep 2022 13:29:15 -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 co3-20020a0564020c0300b0044e81c4dacasi6850200edb.474.2022.09.18.13.29.15; Sun, 18 Sep 2022 13:29:15 -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=Sykk5s4C; 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 75B3A68BBEF; Sun, 18 Sep 2022 23:28:29 +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 E508A68BBEF 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=SzSTgKtm886grJ9riwGcaCrXS2KawzaDkDNZf3Wg/ZvFJSnsSw6JOInn1n+B/5YR0P7Fjp65GgeCLIuDiRBGx+21aVJc3a4gTz74h+5GQ530yU581klJ+iXkbjbuI053LNPjjcNVkANaUSvejQVkSIDGBNS6lmnkZuszIV8xy31zw8VYEIvAxFiTonMsNQ3UzHwbOEA1g3cakCkbRl3mUBekBbE9ABJ+seqeEKEw33E4O12gjO1hm1lIrd4/ErQJpJKMVUOfxSxufDv6vP2kSTJ3ozqJ465752JXOCR5A0ueC4IrSnWz7v6qHDzapUx/HKcd+zJisM5VpZKr4YeZlA== 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=FckgzHXuCkXPZINpDVhVQtnvdMtXnLlaxLgjrSI8ATY=; b=Dqx2JEXfipEMS1g1sePXr/adUA6LaS7kLBuXNP+czZ5UVbJfiOOh31vHsT4W6xkEuIhG0pUsQ7HsEoGUMfztm64xXWjVPVPg+hneSIxy+AKMdusGgQuTcEPimX0a4kPDNoGLWa4tGsO+DVW/EJG7sR+l8OWL5ny5YqqbVSmyEVg4/MeZK5RDURPu5JIs13s3qXdJ9ArNd8v3WJ5beOvdTX345nSv5Tb75xgsvVOzyYa7QjiYinSSn8pXatL1Dp6qG4tUh7R4BvD87kZuPw2UjVTnpDkTJuDNBqzTKQb6HD4ziGYgmVab6ZWAr+bKxy+P1KqgszgzOiDOd7Jaw+iUSA== 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=FckgzHXuCkXPZINpDVhVQtnvdMtXnLlaxLgjrSI8ATY=; b=Sykk5s4CIFmQhIII1lm13+BC2bbfQQmCbTVNhWD3sWJJas8MzuoRUOD8ORiDysjL3ESmf+6VV0XO4wDf5QN18JyCKopPwZZR/jnnDJFI5S4+freHgqD4COmOGemfuyX0LhtspC7dq2hRpIxtxVGBDZXSuutzTnxncEudAPEIf3fJMxKcihjuade4NjBYXckU0yXXue36K2+W6Bz+YOiizRGJRYpuRMJajiqBla17SqH7J9j2cETkE8p+n5GhfEHsuiVblbzarpXapT2Cp4Qa3GKS9YnUW/PSJxYnUKIBFC2E9apMcgQ9fs/rdbrz+x3JIIvD+3gvfEU1OYMaqOTAMw== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rQJRkB4EQWSDCklnlVFki+bHH+raIvC3Ib3mX9pTzI0=] 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-9-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: 827fafa2-6849-47b6-8b93-08da99b4514c X-MS-Exchange-SLBlob-MailProps: 4VtScROZs20lU4OelGykrtjemWOE3/91fYXiGgn6jVNqZuX/cbz5nEIThDIko+gRCwKep+tUxUEf2pWhQevoS/kk/2CfP2lvC61UT3Ol/h+y6CpaRChhoM/mm5sfVV3TcpOPC+rYRNGXZBuqluqoGKzidMZh1mSUfXbSv68ImF7YbyaRCXPXgb9glRpJiwvD2eDgg+o+euqak5wv0ym1YLTF1wBA9gfa5jdT5zg5v7nVhpi45DXw6m+xUXYk1bitV/ORMigBFGOYtYTbk0zDHV6tsGgbCc0yeOlJ46a5RmK2d3vtwwlApgwuFbXGJSwxhGqEkFsQLBmd6dZmYb/16Wa1DWelT1iv5NOCXk/Hy0qLHQ9hjJbpBpnBHfso/2VvcehDC4k2XWU25wapfgtqDf8kFYLzKdPZxQ+IX2A3ZoOoGJ3z9SIxm9V+BR9HgWSCnaEqIW6cjavoEXmxdgMOY4AY4NjNubrAitns3QOAkaJ3Y9LAb/jSbkr7KpGp0IpATRWHXx9/z6uilTWEL5yjo0W4w4JowSQ1FmLijN2gpJaDL6INlyKUA9m+44aky39eJwU5DPTwzewesrQSHP+kJM1QuGrZ8hcA/0OfsUDUodkfugmrNAjq0tH+Lrg+p42mjJ751sUi1CxpFX2FNCoBJr375aCKamQ6+IOPGFtPDQLATz59EOHhNQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lPwK4YlP945DCnzwFS2XB2Y18iM2BVziRMdgAKl8IJZ5E3FuVoTmeb2LmRqr4uUnFUrp0jrOtcSurBmbunSYcwJwiE9nOOwRfXnHBtwEmE6GHbaP85gmEUsjein6zHkJn8ylXU2e4ZTUscwqvF/Jf8tMreXaqd1L+/zjWDgELgs47MfHuE/iyTPqHOIiTjtNmHwzKcahDMThGafDDOCA0Dq/VJZTd/tZRFA4EZnf17lLeR+9+ftrJRI1VNMN684CsAf9VqUtEOvgSuK/LGLqpEVOGWwXiTE8MtTr8OOMvHqsFS2ELzAh1Ag4J73T5Ep0xitcaTlaQx1sqeVBd8uiPG/93g5DtMsOJwyB+39AT4V5sIf/A2E7hakw0atMKuG2h4oR1oGS1MqotHOaf/d7tzxxOi4qnO8I/bBmpQ+WEOBBmbMMKQjAGdPSS0ibTyFY2WQuJaqf1S4AOX1hQXomeug9uTW6RL3QUUIt5rFM2L/l3quzHEi03+s/9ghGG+dC8ljGf0Fu3+OIKS6Pn4Bu4TtO6RFmp659kNkAnzTD6aGwaG4PRmWclYxZraLoGzUTw72Awq0h0mstIPmgKa70tV8c632r7msGxI+e3ySYy+GslKrxv6bEjGm28OcwzOCIlGbPyojBYIqSNRfWmRYoig== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BgR9Q3Xb06n1t+SU+pTTWan5mqM1SbRTxxoWwXjCW4cyGobeV3IRmu5AjYf90CUoGu7mD7H6pK4/tatUmTVSiWyTQDctmTc7sY7Uq7Zt5ItYTB1fxBuUmCq8bgCSvwx89l/Ugz9LOssSFh9KRBEK8i4CjBwtQvIgCTW/sbz4v/SkqS+9+3cIgklQmbbrOhwfaZc+NBWXVCPg6wUGVSiikTSERsFkrSVeXumYrnGUolKSMRaABzXjGnabe+7V9+zZ8Iu8nuB3WhPJ+dBNBaG/3HtTb/hMc2ze4QYSpTiQH0WTIlL3FieOZ9ro/ynRaWkOR9o0fuomJAsLgA8LqpItwYAf6nd6fDBjvMB3G3FvIs3P8IRApm/b7Cf47MVGJ736ws+DqxSAe4WNSIgRQbXJIIy9ES86B7kuzttmwNZpklpqm4A4dvhww+wvMibbeaJ1vK6L7qbZjJOuO0vW7F6Y2yw6sdpHjf5x9Q7u1EmawSk0X+e0nb6ORBZgEcLJLiMNdf6//0zg1JnHBHScX4bGpiCHeuLNFSYiIJNDE1/jCOLbcssm85MfW6aQnBtGqae/91pUfq7bJxdCnZo6sTY7n3V8u1KbxnP4SenwX0IofuCPXZ/xCW70IY3eHep+w83QAfg5Ntr8kcYDnnmtQytN5XwdFOB+bisj2T70c6uFXGhiI1bh/sR0NNBHHuf6hG0l9NisND2c0FKqSxOk3tbZsXVNGlH+Prxdk6tPGq3dL2kmApvoBJHGekVUZ7PWXNso/O3fXZoVJrVY8bPQAwoB11BDKtlbaeyh5KecdcE+fGB5MQECSCGvOP6J9JbCxaQEixg5ZGlefdsU9YbpC0p075colheA7yL+0bJQi17gK23lpxn8W4yovepixgvC6oW1dCuKn8ib//X7DbfKvueF11hVc1xO5tkohqdZvGhsI2ai0jmWZZrHEulOHOC19o6/zsyHfiPvlVy2Pietx30SVM9YuKXJmUxNK8m5YtYylTg7VETL6HIPhZkJEioMx0ZibIE2OklduAigAqb13vdd58nXnr2PVl9CppceLCL6GZlVfzkSaqwCr0MfDYSH5bQOV5tCUgb6Rrm3wPuoHkiY5SDs6CLfBzx68lcmxaEdPDZDnnFFwctGdYN3YsGPI3nrbtgkVxhoBp6gTN5kxCYIhnRIIXo4BF2c3MkiWpcplPRQbR/hF1foD/MnPfYT0f0KnC9Ekptqsl/oPW+vspJVkDKoALFelNMmyZG4u+ohSPluM0ZHh5bb/dHL0u536tOmV1gixU83n0QBTbaKItlZq5tLDidsfZD2xcHkRSrGS47pdfoodEbiqsrndJchXyjA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 827fafa2-6849-47b6-8b93-08da99b4514c 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:16.5511 (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 10/17] avcodec/libshine: 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: +6znMIMtjLIe This encoder has AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/libshine.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 621c57816a..e266229f03 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -44,11 +44,6 @@ static av_cold int libshine_encode_init(AVCodecContext *avctx) { SHINEContext *s = avctx->priv_data; - if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 2){ - av_log(avctx, AV_LOG_ERROR, "only mono or stereo is supported\n"); - return AVERROR(EINVAL); - } - shine_set_config_mpeg_defaults(&s->config.mpeg); if (avctx->bit_rate) s->config.mpeg.bitr = avctx->bit_rate / 1000;