From patchwork Fri Sep 16 01:10:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666195pzh; Thu, 15 Sep 2022 18:10:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5DSvXf4FTTmF9SLUuabGeYuLwcIRHfcpEm9d+MODvMM89Z6pqC9uaIopGESCLzhvawY/GJ X-Received: by 2002:a17:906:9bd4:b0:770:4efb:acbe with SMTP id de20-20020a1709069bd400b007704efbacbemr1824777ejc.436.1663290639053; Thu, 15 Sep 2022 18:10:39 -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 h13-20020a170906398d00b00741c0bd705dsi13435873eje.631.2022.09.15.18.10.38; Thu, 15 Sep 2022 18:10:39 -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=QRimj4Sg; 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 A9DF268BBCB; Fri, 16 Sep 2022 04:10:34 +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-oln040092069065.outbound.protection.outlook.com [40.92.69.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B80868BB2B for ; Fri, 16 Sep 2022 04:10:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ew+Sg5GI4A96evkn7QqPXWXr2jYsGqujEWv3pZIEc/ABFbpTlspHlB3RPK34LfBZo/EvB4pxyQHg8XN8mV5aAkoIXcoR+RP0re2SP9MDE0RnhSt/sidbqUxNNXOydKRdgku1DOMIJ4EJtCtH7F/WeokNxwkmYit4m0sg598gqwosKs+9FK182Jv4ptvZE/bSXFXyd5t7VgvLS/sZIQkVutMdEVhUgVgQm0uCjtjzRko5SjiobJzXhX5pPDpDEG+F5hE6EpPj+/x5B36yvIThYSuKDta+kfLN5G8GzbXOMYfv8sM6Lwz48AkOkMhI5+X05tE9Wku2kIIci3o6N6YKAA== 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=4Neu78BAVZowdtGLZ5VWsPl2Pg2zouT2aW5Jzigr3Hg=; b=iHi5qZ2Vua0EHfXpuoDmOnJ2BbRSkPS0g4VQzlolGNccqXFfbEYUmLgOQppM9lNuUv/R5xn4kkmONjcBj2jIw4LaOKWI60U/46SgRZxFbGRuhADLCeMWTq6762j+aHqwiceFFJRJmIF9uh/XnKtBy7WPQHVTEo2inxqndTTiyd8FQZtIqwWYdnuHsTa4b11Ow7+U3vbe94FF2Pjapqzb44JWhf5HNtKdHYCgy6qyoCEdBemN73hLlQxTXCvKHT2/gish3L64nMMNvfDS7U5JbMF9bHM4+p4cfUiqswhBIX+FGn0EO4sM2xv3qyUA4EZAsx7j/jqjhBeza51Cc4WF/Q== 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=4Neu78BAVZowdtGLZ5VWsPl2Pg2zouT2aW5Jzigr3Hg=; b=QRimj4SglbHppjYpV4yCrYwy9oU1n1ZHQ/sNtdwhJdu4uQg1qEn4WQgTe9jfj/2mtNuboM7FX8isk7jCkjkIs1w1z5g9oV9UmFECe8zjOgs5pw5WwpmVrvOCH6zmTZ66yT3SsnYsDLT+ImzuYcBappoBMNiXNJQ3X4mVEw9Vrnx3KL3PNLr8bJlAg7DCmPQyhSaKAyRdH375rWrOu7Aa7+0eRLkfVEE30AJwVo+1Rw83el31L2pgxgDM18en9Xjr/b3b7nb6JwQBTymJTVbRxs8JH/zXM0bLJNq+texjjtH1JZCUfPx05bAMuI3HMDN2ZLd+ybc9am/F8KXrphVqJg== 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:10:25 +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:10:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:10:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [73PVn9fTvMwhNsrWZOnlkNOjFPGwxeGInpv0C1/H5Nc=] X-ClientProxiedBy: ZR0P278CA0131.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011021.3019960-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: 14e674f4-cd3d-4ae8-a880-08da97803c40 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwiAlKx4YLPXZ4B4JRSVY2qlH6CT61LJ5ueHUaU9EBsJRtrjBStuDhP0OBw1Qs6vLxhjhXuiuMTKCLNa27uZs9Z7xbi8uRo5k2+sLtlAft4v7YH/W/JVPuWWdrJl+hwz9ZFMbSaGgUFE4qlSwCPKv7p+KNTNG42iuA4xSR0q46TOpKWqZkIIVJn2FI3sD+GSNSj3GjEwSRlC6SVHOiD18hOcO1OpYEKcO39+BppJNEklD5281wUoo+qikX7ewhYbSBmzh37+caoc0+CViDukt2QboRBTfQFDDCpiqumFHIEeTILDDdyL9XIPIDyM3L9tvqw07gPHvbt9h6fYsoQ3M9HxI0UsGnyOv/ypIr5EXIXpdE13gOS6ZVt8Sg/k5psFRfS76YZ2QMkZtH8cDOD0BFVGhJ8gRF0od+4A9fMVxJQfKzmQLe0P62TqIIJNARbCYnqEpoT0fyJAs756T/cFLm+ehWZiAPvF5Uc519vUqCmWfGeFq/Ed25bfBlS3OBIfEp/7ynxmOzW5aMOEuEhQKlkiMK5Cz0eezLWv565B6L358IWs5bBftC1DhcDr3ZTbWiJXEpnxWS6Zaq6n5R8rWUh2Eez4Wq2v4IzsO26JS6k0Yo81D8hUj0PqGJxYZ6gWqZzrZY8pikP/lwCgIs8bg5PuILmASyBo1O3AjLXG1NYd3fPD7/bfg4ssGNLSXg1b/aqFPC5fNbqzbhYhzMy2Y1k9K+teq/cDX0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GVXmKryYmwMjem5sN03vRpslnKeSY1nhiDCjml2uGaxV18ih3imdI86Ow5cgQstLoPXNzv6C3mLGK7Xbw4AdblQcR4G8FiSGNHv6RC6fKe4zixql1aKISA+1UR80+5o2avXfgY6+djbHtD2iH3lNNOjAiAyQ/liaGHFmdAIAk9gYp9VtMLo8d5tDV3mYOarrukLyuDPz7amjiabcwFpwM4JuIU71csixk0hpS8XvKuTap1Lz8lKIEtMIhrJa00zTZ+JR1N4XHVIFQTEjNqfpxZUDYEErtLnBAFtdp3g/eGKQas5BRmvaoVKKcRXkcJ1TLB6vPFHZPNf1BnUXiFMUrjrip6m9spD2CXZ+yMIZYWFLnTEK6wn4JObuDWjOqyy2ezpQtoAvzN7QO3hhNinlLxjBuck3N7ViNFq5vg11a8nZ7xnFgTU3v4evcbjZcp+id7F/ddpNim3sekcFbH0aaSBv+iTUj44niCxuvK7S14I3hqyz+FjGD2kD16pERCNhhJfwSDQqNCvSORKwaaQ62C1Xr1wiQP3EVddmJcBSg39vdugWsWgvZuv86IgjY+5y7Q9rfu2/DzpjzNzUcGE9fWaPG6QWH7+6XYzKvSmihdvEpE98olsDKIlMyhtdwn/pr21Jm8z6DvC+jcxbNsI4bg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EwQvDYZ7ObOfNIgGAfVHJSZavzkPk9XEV1KH3XtK1rtDEonib0/gElEKqg5oN8z0eTrcoFncNqW6aVOE5OiE3CpNT4EIHGp5QzoIDTnHkMu7WU8o8p0EUS20WPBLKWCoTV1gDoqHso84/YYPFV4K3dN8Ph5r5bEFwbIiTHV2DTCfexU3jvQTlfgU95N543BQsafZSxOEwBVmg/FqaQLld6jljJ/a6X18WvqevD/t3//LIYcWSETooAU0iE4xLbt2WpyGvBgAi+cUi7KYxlpRS5EQmPgQH+KV/LrZXqkzxQPIVtSXV5lqfT5CCh8WmrFpMTzGi6z5tH4rYIqbMPkn9s30rU04wgzRfTXJDthl7IDYWR3hFmFVmBZePUmM6JqAJvzAmR7rPJqiB04sTEwypw++dgTLNfCCJEBRc42JQDtHIZ3IinOoAs7omPYggTUbm5fhUB1dMFffNGbtM85hpPkMP9QrobYHahmU2y3Gu1vPX7nDnKvFVSeQE+2E+Zg1xQ6cwM79ii9eG5z+I78rVMWT+DqB3Sz4FYroYC2HMKeF6NLzEjNu5rkpHqSNKoTJqHhruBI4gz4MCJGF0dGdFR6xhrJoHdy5P4Ybu2f8kl9/SVo6XeInQfNJ+82FXYoi2E/9HciUjrXJcb6ySV+FjZDSxIXmTsJh3pDhv//o3u5dGsRPjXUGKbD/JgNg/ZfRdaDGH3nXa+FQuezMVDT1lwCRjfRPMWAsM5KUsoVivQawa+nkQST5ZJuH5EsP4zXh5lzYZXCmW39H8V5MMHcZGyu9FgXtXJ8sPx+vnW87b/ANv6enMdVuAk8GlaIEqnfJSpZQYntkwWDTvIcRrPhhUqqa35rSoydPcaAXBqWAlNoNrR96Jg1W6P8ojdOd6hZsYCV4XpPqwLiNzpFjfdRcG3NzIFeP5//BnZaAApIL6q4SMIWpvZ4XVe5sD5dk94Glhf+ltBPBZZV2Sga8RXK3yE8JF6HtEIcTaQQkV8l24WQ8D8ofBpe4DuX9EofsH+NVWXt3hMuuDvZeBY5U4LZraCWo3Ax5O8BsmfG1n00jjjyJxpeWNtUbRoyeKU7N0tXylHsOUwTMvwJI9MlPd/HsvuSmYwPstwByJzoAiBQkJk6YKlPczH9V4VWuCCZJSEMcQFJiACTATeoRBLX/A6X9FyKHhu4whF4raHZaGU+wXUNkOQwG89iwLeBkWjXAHyez/S9VGgNwl8auqPaWmUg2edUWnO6NVkQQxKnIIZM5Y8u5bkMb+MbCEzjt/+G2kogHiUNJvKFHXHfuuORpD+2c6NAhc14GBt0Uv9h4pQtFEU1q/3LJzofUS2Gt6N1J+l60 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14e674f4-cd3d-4ae8-a880-08da97803c40 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:10:25.1636 (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 1/5] avcodec/decode: Check for more invalid channel counts 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: 6hwwUsFBFZzM Signed-off-by: Andreas Rheinhardt --- Maybe use av_channel_layout_check? libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2961705c9d..e24005cc44 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1595,7 +1595,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 && + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels <= 0 && !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); return AVERROR(EINVAL);