From patchwork Sun Sep 18 20:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp859024pzh; Sun, 18 Sep 2022 13:30:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6HF28kDDksWMU5M9hG723DWq/8bYDUrsRTqnNe3/EOoxo+34VOQsjHFg1tUZBsdGV+R3A8 X-Received: by 2002:a17:907:783:b0:76e:f290:8b5 with SMTP id xd3-20020a170907078300b0076ef29008b5mr10966270ejb.395.1663533008550; Sun, 18 Sep 2022 13:30:08 -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 ne18-20020a1709077b9200b0076f23cf9c76si24321078ejc.195.2022.09.18.13.30.07; Sun, 18 Sep 2022 13:30:08 -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=sBK4kTJp; 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 1716568BC57; Sun, 18 Sep 2022 23:28:35 +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-am6eur05olkn2078.outbound.protection.outlook.com [40.92.91.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 552C568BBE4 for ; Sun, 18 Sep 2022 23:28:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=anIPAmAuc6qe2nuIgLcwKfxOHM1vnu71v7ZjjIZ3mGqT+YSUpBNOUo0JLggC8nqzXwhqUcROD9KMMzL/rwGAjFOKM/NpW/6fGR9rmi2lu/cIVMsdnIrC/Do/UsLmTNtQPPgDk5CR3IY7RfIn5xfulmKe9zJYppk953aRm5ldLDwFS+C0oaqfgA71mb9u5s1kqANBhc3Y8HWHYB+M9BcuAb/sC2xdtewP2vjzs4ukde2Fzb346/YgMZREFXrlDYZOQF1tHbrRnLAdSpiAaTe8MqIsc+FaqRRMzBQy4r8V8fRsd1VadA/pa07EE9rW1vdl6NWKQ5IEPpDQ1K//0q1xYA== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=LJPgv4UaM/b/521JE26eFcK8I4j/Lf/Dwg/Zuo0jynhdYEs0Nw8Jh22G7sNPiPLjyg7la8eF6WMicTge5u7U+kungY08d8JWRFN2xHbmq0aGrHE7wnmgyCoR50yAedMfb/d3x7vWKRk0a11bwtOat9tf2SH/slEB7/HkK0v9NFWkouWOQMyIcFKNE45Qb6CSYLBkUe6Vi/ocwFEEbpGjxckJpFFhtpQhiIuuSkdHrRqJpyVxvCtKURGXl6FGS/yD3UCcQHwpgP6xaYgCY/HlKzwWhQilTmkQfqTSbtVsRJmAjmPnHLRr0KjOlSEljaJpEAMPEKRWj4alqnz5w9SuTw== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=sBK4kTJpAuQDnz7kAjV3aO16IbsM8L8gTmi+Iv1GsIeYUrKGbEKE6hPoBD3fwJU5LdU7L9S9nbSPYaye7w5vWHiOOlUpOcDfw0A0JcwLmwEFkoqHdR8WRoUgAqEMej3cdDwOjVKY2+jTfh/XW8ge/5+uDs5s3y3fS6yFC6KdECyz08IU7sk63wSbFb8nQKVfYP16X4tMxgkjZaLT3dbIe0ph5ze37B6swDpbg/jDvG+32nCYx4XFqLurs2C28x2d2G8T+40IVoh5vC0UJ1KhcS9K0f/H2SMhlCVpMkXchqZzntLHu2Wk+TUPSdIVME40Pq+FM6SMI5TITVFhjI64gg== 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FOTTaHqD2dqsZWVAnlxpoIQE/+lSwG0eCMcVA/tAOk0=] 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-5-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: c2c4d91e-4288-4830-2499-08da99b44e2d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN515oHc04P6P5bLoduW2EgL4O85DpTnhrA8CX8L82E2y7rjC1BK2gah3euGT3j+QDurhytB5HWDi1oZCTWfpeOTFeF/eiR0RoQxbIV8PKT/2VWYiRgHYhdjG4PhljLKzHEdyfHG12WaAlxVBYjah6h7rPGIspd2bFwJV0T6bZoj5hz5K3is4KzI7gZFnEUGPfcXhk3NkN0rvfPtrE1V3Fv5L1jPaZcRDV6fX1jYhKbKEHlpUrKmcwvmfBkC+xp4YS+J7c1pD/Vrcolt6qgT1Vp635n6sRWWz5IrNk1UUIMrJVMrw+Y4w13jzB8IzwcEJc1bYlxsopeK/sSbGPfVYqKHG0K+NrizDsNq3oIsnI6OgXKzg0+8r+LxAnowrO/dTRT6t/rjPjj8TW1bKWLjI87GgcjcYD2+j2al09OLz11vDqH2xvzrDKq/kriN28WHi1SBnbbzHbi/ybomkMlVddvAyg3m0/8d54Pp+TozYZa/g0W8IdDbJwBg5B6+Sm7osGPM9kbkMf1CkNKJH9ye99L4i252x3GaqCUq92xlhTk46Z33uxDT4coU1MO7LUFWFC3mODEW3FlZcde7uEsh5a/wvhe2Fp5DfzC8IKAPpk5RiDO8sg8hSorqyJq7OYUq7xEMm5T66vHSl2838ZjWGmdp6+qDbOlJkWD3WnpFmQB7RBnxyq/KcJY7V2+AxUaaoyRG6jkNbySV0x88O/VqvFoWUBeHvh3qmKywAD427hI4V6A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wZ4SCGc/VtTU3RhsIdLfKatHfOueFc2UoVLWxw5i9PT6B9pVbVzwmKb0kSfjMnIMW0uCvIFyQxLOqEaeR2U6N8bfe/voLiKCq462Bwz6HhYl6oAU1tvgJ6ieUeOWEN5mhqeSj3dL3pwgoWPfjfjOesIPkxQ/ISCN52g1CsEyQcEBDIfFsEurlX4B/qASzvGJRJ6D7ZmjuQ+j6Wc4zsWzR0NJ65WvlStObEvOdGPdldj530UyX4ooQJIaYMzzvnWMbDN/FlQQ5jZCZciLUV297Co03/IfmInY5bYUl5kt7yFnYLTz1/hG5LGmb5gI8sP7vnCIcHcm1og2NKc0Pgkx1CoNb8Q4kpg4XQZPblYY4AknkiuGqtcBFhXSzOF4LJM5wZgXZ3OUE0TEvjlzJIYWve+vQJO2v4dzTicYRVkqTPnxWLjCltPZ+y0DBrgCKQqBtUh5zjhfzBPESwGTu54+0p6GJPw2+Q3CztfzvLX2IyUO2GbSPlZUObIihZ4gjI0fGtv/kpIBfvY9sIuNPYLHZk+1k/mHrNr9NAKNK6Rqf/FxdR8wNX17GRg4fKgPWkdo8UnO1/+WZw41yuWrLVclN2bUZEgIaCb9TpNcp9K+LVNm+8Rox6svrlx0IAqvrLndgKhXM/S2OqhPf6jpWMm2yQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HUT8GRRf6JH7/PU9wNTSMDySoOqmfK7EMDZn+grK4bhpmrbvld5DfFpoVNQwP2e/GEZ3v+zOjOrEJFAngwVvgaApTsLF9qzxpWtIxgLd3sRkXkIiadDjRCBdvEk5e1DkIRVG0ECKk1XUFPjHki0Yslb1Mg5CTSk5mfu3o1OdZwCbUjZ5T0tFa1CufgPVZLao8FYxgq+amjy9Zju64b2ehDuHqgkqJly6vqoEjRNDpWMbix7jzSVc/Lofs1d9rH01Ku2IG/Jvz2ZRoZZodr02Y9SPRAOAOPJAJtwwexKaHhrX/EGY5Ac4yV06eV7eY+evBzgQEw35RFqv9aB97mj/Nce5blIzqvaE/S8xYutBH9YpgDoYrAeWH6D8rAJER0OP00ZVqnH5syRnt506ohzQRTBJvExlWQuiQETwhaPBowiLs19aAt3v8bzKIriLs/yODJRnTR6Cv9Q2sJ10qWzNGcKvulWKgnh4Yu7RHRrqofObUDhNvkpVfmX1HA+oKEo3go673fbdYs8Y62HtEauX1X1OOPi0g8wyxoQQZ5rmvhASV8JVCA5Dbd3vJovt0v+I2Izj2m7LKR78ETLg/9DYKjtsPFotVnpuCt4YJEOSdXBTDX/xkqLHv1CmXEcyP5W0WK/girXvUIyLgcr6rixW6nfhKj9l4psS0S/z9znnwqkqnziJywbvXtbL3TsndkGsc3VrVXTboc4ojsp2+3meWOmRB39uywyFwyQsiLMdLYpOa7JlXHYYMiYMLg9A+eEnOsDaTDBN9pFx4LDtq5EUPxj6kc4DHo/zTHyyMFFGc4VlkJKv1PMUrANCkVufW5VkUx5F4n0dDR1fuMNfqbUlfGA9icGk+aoTXibmj4h5f9C3/y7229PMnA6z/CYMGR7Z/JdtEDBmqe0/tAVG2er4PeG3gIQsPAbAHlwWGmbJqC8GWKkmYtUd8s/Li588t9P7c47VqqgouoqzbfatcYoeSiqTpyp5XxBb5vHenQOl8EDh5wyFkfQd60+fErCnt2vPm73l+3aB0tjHy90hXrWPaSzD/zLBEUgNogUrRiTeHM1bkiX72lQS88uOcsybmS0CzFTljCaWysDhCUIDM31mwS9Pd4nfaayfqkFAN+DSNFLbfy6K9hLwdcWvZ1XiDOmWpUvLOPbjGG6GeuoLI3rNQWOcep7DfBE1EVy06W/t6sCKGFfHYZQYwBo5nOqnPTKr7+AjeNcFkzdaSs67IKBD4TYyrwrZEfNzV052vLsTZwM9IwvRTwTVWRAY5KWxiqsbS5D9H85xWb4E4xyAC10f2Ns2/mDznEGb52vQi9GeWoM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2c4d91e-4288-4830-2499-08da99b44e2d 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:11.3282 (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 06/17] avcodec/dfpwmdec: 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: tI7Xo73Qqn8X This decoder does not have the AV_CODEC_CAP_CHANNEL_CONF set, so that number of channels has to be set by the user before avcodec_open2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/dfpwmdec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 532a955b4c..4ddb806561 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -85,11 +85,6 @@ static av_cold int dfpwm_dec_init(struct AVCodecContext *ctx) { DFPWMState *state = ctx->priv_data; - if (ctx->ch_layout.nb_channels <= 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid number of channels\n"); - return AVERROR(EINVAL); - } - state->fq = 0; state->q = 0; state->s = 0;