From patchwork Fri Sep 16 01:11:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666665pzh; Thu, 15 Sep 2022 18:11:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5d4hCexgabTL2y339lCfwCx76ZpMquy8cvShDEvqQ5Zttudhv6SvAsEdpgP+06gLrdrwE6 X-Received: by 2002:a17:907:1b12:b0:72f:9b44:f9e with SMTP id mp18-20020a1709071b1200b0072f9b440f9emr1746265ejc.653.1663290705091; Thu, 15 Sep 2022 18:11:45 -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 du18-20020a17090772d200b007417c6edb0asi18000226ejc.402.2022.09.15.18.11.44; Thu, 15 Sep 2022 18:11:45 -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=XJvhCP9C; 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 DFBBF68BBD4; Fri, 16 Sep 2022 04:11:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FD3768B1CE for ; Fri, 16 Sep 2022 04:11:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MsZj769sQlsoT7hKfru42H7jCdabyCKMQeINZBNPp6QrD3hQPysOWaQDW6SREsXb8DRiOwhL8HiFz3CuNYdyqBGnMV/CFn5YsoG8X6Ci4wVz6Ua/zP9pnFxeShi6b4+cHKJrYCeivIIlKQaQ3My1bWbJKbocEUReF2nj6d0p+Wo5pmTNgCHsCjjVDDuEqXzZ1ppAJ5PuDwfOHEbl35Ai0y8plb6c+gxa8SK8LrstITx5Zz0ZhNJvv2JTKdQNBojrWmYej1WGnmbibrB1kqSWDNefa+QI1hFFgEKntXL1SCGrVfOrv5sNmcKFwSC+fNUvXnNQh4FwXSNC8ZEyhHOTSA== 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=RiCtgSjfCIrW/hn9i6q314UDEx+AiJIqVojZK7nzwGsPdJaT3WAZQlGUqQh+LMQqqjO9SGwRhs7APpvxm0QOhaM8CNUzTzV01dGr56irkoXnYyirudXQ83B47xZKctY3LRFbrBri2ZA7HRjOkvNSIpn+uqLTOGuz8EG9UF/dfgcrfjWT5F1/RRBkhBPDlgJ+QrbBa2j5eWRFs6vz/lhTl3wYvZXkuwuxGqrmUfC7eJR2020O+TBP5uRuuPNPWAwI1Fe69RY9VxDqrk1BZnJAoKVAs1MgnKGl0jrLaRp525bFuyKuKDDFNb7uje3IKnvDfhFL/iCRk8h0CCrOwa+zgg== 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=XJvhCP9CXMMblXyrjGS5wGAU40XzJCpksx7kvi+8AQawSLLFIzjx2x+sY6NiKjyU34ETv2kI2nOyoPxj5TyJRSNBAzhXRDUO3KhrwMAXUWzb/Lwpjoq13+RuJeUg1F3hGgIS/28qG6oC9WGUJL2XlVDF3IiWXdJeLbK0BJzCNlz188mxXBr/QPa/RjlzNQe+vLgsBM2wRqfYj2zMT943UYti4OK92El+DknrA7zliyvvKzp9YElvBehqItrD742bQLBK8/rwiYbOttaWLHDEbN0Z4SB4Bd1DZwrnuNkBNwf0giKb2zGh1a9xsaltCwFbkgulu+b6hMlkx6mRyU6dTw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:33 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JOLRWVsOWnkJa0Nyh+jjT3S8Sjj8VLQ9hTvaY09NxtQ=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: faed1778-22f6-498a-7111-08da97806532 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpAR802nmGrL5i77DvupB327MVkNBNfJp64wrF+EZBacSfBFaPoJbpgMGrQ14rf6j/To//zDbqDCEl3cg43FKSN/29nxPQz9R+F2qwd4afjznsKpumbZPEYmsq3icjxNmQK/I6qrFB9JCU1/LpcBhYNLi6gHHKEylI09kF3fmI62mG5hYPY38sK8/XHqzb7K+3O1K2xyLDWgIObwD1kU47F7UXpGzPvtWCjY29QgjcikMMgh0YJg9rWxU5q1RJdy8VcDmvvzwe/i3TOVNWuwvtNBQZVUtTn37yg8tDw4Xq6KyDSRGixolld7D2A/MgovHYw4j7pPSKYUnb1Gm0pTFLsPgesEVZAa7PxdYUu4VCQ3M/krZHjUyiwSIZJjnthe8gNa/s5Q6BRbyqBagBoH6pdJixBp1QwLHrLNQkG0JFAID0KbYA3xz8iTSdR16A/d8SfOsBH52UiUVw26TbHda4csRV6Y+PZeUpVQ0dOuyIHZgIXyfplSaoqyi66Gl8aHGgS90ZAgeUcTBKAL+oKQOgqdr68eKw6qu9bkfvuGGUcx+J52dF8iDUKs5zpAJDmLJ0EdXImv86Cv2cW1p4piu5G0Xl4/I9h7NF6BdalgPELDoi5HbGYfdKhjeEm8NRHZUllId9+MODJoiZohSMe0fWRN+GGwzTNykY+ibcJD+EMmSzq/1ogjNPPrpQ4DznSluYObrJoguUCyuCpOzU4Cq0nXCiwwnrRSFxqEHwLmIwMZWiprRJFG6bVloR0cKK3s6E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rwYozYGFAc9VuV7avUs4Sk3FeuwXtBt0JmSnbWfmd7l1PkgeFWguvgzbx1wcjqsu27qcLzBah/HQDh/1PCaGO4dsZ86xW4c3RC08zn7jZfF7EEEGcR5QJj9Gu1FgmZVojkBntq9A6MC0uFajIElOJ7y8kUq4L9us96dTQLjOI2q9vANIlgyALuJ46a8IQ5eSGQTJWyEN+eLzx+iFeOHNOQ+WjF65DhMwYepGkYhQqsdU/xW+whNmWT96NGpi4Aqz/2HIP9UxN7Br+smiEHgdnl7h2LMUdN3Kr1riXn00wTVLx2vD/ZvMjAkQmC7tfzJUOYWxUJ+YBtts3dziIOTVLBxHKytOnGaJTU1d1jceJp4NroheeAda5ITcna3DbVZCYR/uII6rPgN532vas4qioAmGn89m0g6CLX5Qn0i6MTCieu/v73/1RipVeWpPhXwMaiofrDHo2KnGbw+obalBYkKH9YgDt4a3RJS1i+rH6yuNCXkQRlbu5ItWHjjS0TDAgvOUrideTU6l3TSj907/aWLt4JeolGvVTNBORTOK45+Db9pWfv8hzg+VebgEA8HPG067LTRf6cEl8urmn4RdCfmlbKn8qXnGA0gx5T1RRtuNSdLKJNa0JXKFQqtw6vAOulC34/mJbq9DfolO+El4pA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qlOtnLoy/vT4BTKmHwOq6B4swqgFZacTqUxAVmmMD1W6SY6mGEMvTV8Qylrymmg8KtH6ouDLGdJnyq/8c1nRs8bjiFsn/aR3EeVBXdSwG5RGHPBIX7opVspWlwcM8n9bM6AeBlZkgvy8tUbK8VJVV/3/znsep3Qlo1st+cyxXNih5Ohq5h8aY+XHGUBol2Xbc5FzQF/eCLx6vvGUX/ZzJalyDywnQEhDYPNgj09+LbeG1UKFEfzAxdR9XyGhuwsu4poqT2aI5cypJJ6H0O4/M1/C7xum+G5o4J4D/Qbq5DkkwVUjIplZjGJBJCfqmgcO+WsgLeFZU5sw1JkH8K9mOrJilcSG/LMoEYzrtTT9yWnhuZ6CUkEfg0k8L9vOCwRL1Gc986RuePwebndRcHYGZ3pbvMZwRxQe0lcJzFODBRk6qVjie8L5iwPot16ygAuYV6uRHAyjBLjKOyGqgcvcbjKeVdeJwRheHbGfkI4DCMbxuzaC/UCn8KCZtBBBzRQwWZ5khrw26cUNp1jM09dw/k31HeXQv9yKakYAb7wuKQ1RGJZ77T+65v7fdlE8DUSA+B9JIFyP7d+3T+zB2cPgiKZ0A8pB9m5I4GMVDmjVrQlwF1Lvl8INEEVmtJ0O++k/K3L+n3IN9o3ldIP2edfxUifo21HgV+3QPsKPR2PWNgWI2Ky1CvbiyqmN8PaBeruy/IWtaVglbZ4YyksFHgTLk2TXDQAFexCVMdafIorCo2vmLlvb15t91xZe4kqWn+hhJoMxtHuJ66FR7AUP3uaBEfIV4d6lxxa0DeySQfJyZ/CxIucu3xsAJefCnivWILsI2CTej5/2fu7j567FhjIHVe63v5D/0HQLKpsxIU53J1tdCzkxSgHHA0SaeFy9RMNpNNTkcHb2R09KHza3Fj8QwJYX1dr5EjBpPupbw/NtvzrGJOka8IYjcqIsB6L3z1Kxe/TCmtFkVgrwURmvd50HJWuqOFoE0+BBHh8yOwjvZxNDtSmKB6UXFyEZeHr3scziF3OBC+F9NGA8f6LGsCj32dUIwoPDkKJ2lgQPi93PhGW5NqjVmyswr428mafA8xyTen++Bo3+XzD4nhht9GCLgwLs/UB1saQDzqyidDj5ggEfKjEPlBJNnvBrv+amEcfKaS5Q/LrtBLrX++FqlT7gbiWoowKX+TRqgZ57qVz0iIQNdpw34aXNKUGKBK51lkUHoT8jwdSoA5vxshwTR1wF54g2SQRZbESHcPdTSZKHkOUstbyrHvI9mlI4pE6FkRSKXCMT9fj/L3UkIKi48Q5T9QCQD8G2yucRKKSRQIpCVI0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: faed1778-22f6-498a-7111-08da97806532 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:33.8102 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 2/5] 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: fAHepgdg6LVc 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;