From patchwork Thu Nov 18 09:07:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp496604iob; Thu, 18 Nov 2021 01:08:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIY5co4/l9S2yDLaBDiig2bMqZ8fuAoLi4sBLFKdr7lRZQTZ8wyqNrCTN3KUBfZnlooYn1 X-Received: by 2002:a05:6402:445:: with SMTP id p5mr9299365edw.110.1637226484926; Thu, 18 Nov 2021 01:08:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr2si8324821ejc.95.2021.11.18.01.08.04; Thu, 18 Nov 2021 01:08:04 -0800 (PST) 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=oDrPyHza; 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 A428668AF1A; Thu, 18 Nov 2021 11:08:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069063.outbound.protection.outlook.com [40.92.69.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93D3E68AE72 for ; Thu, 18 Nov 2021 11:07:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hR4A/kUhNLvQZ6/tXm0XyqQI6sM5xGGPoX+5gInYh8RJqiq3Wru0OBfxSXoQl1FDeCtfM3DU7mgh5ancLLSVIo8o+dBulCH49IJSDg2dWP91IXE2rXmkd5pjPoUetTYwNADORHS6oqfrT7KfKweXyW5euRfeQoHRkYZexL31t1fKx0uonBlIoTSnPn85ZBdbP0RVO36te8WuPWbD8anVgIbXlvlHy1WoSMp9Z6O7yh29RSFNmvoNl0N7/Im7y5CQkUa6lYYruG0TvBlNrpn6Ohnx4gVE9pVUTRulpXfpcYORIDkuTeA764xCRIIeQWSbWiawINxeSB3iN3cZ68Q3fQ== 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=WoQc25ROPkFbXpdvmahIfEl3ARx6zTKN37y8yhA3r3I=; b=Swyrypf9MEk2ZEzqaa3BAv2/A14zn9icFU8lSHUAShrcToQj9fU3y7X9o5RWuGf8jZvF58a45tZDwGG6ufXoiCO5wfGylIjFB70p81n4LKgzP2VmjWravMJBHypj5vq+yQ/vGEZ4VNCs+jQ9pJwsndHYz4V5ztttMWxs1Uv6JqZRROm8E5j8V2qNuwu2itrEzbmob+zGvyH9E9hz8Ztje7W6jjoqKs7AeRWA/+qw1X/OAfbrEp4HA8ctFKWUT/jvYT6pujF/AvsjFXoivV8kQlwtplv6474sC5MXHD2329pfg+AImXAMTaulWpvEOVGIbEyOOEl27S4hoFV6QHZYZA== 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=WoQc25ROPkFbXpdvmahIfEl3ARx6zTKN37y8yhA3r3I=; b=oDrPyHza03qsAYj2A/fqdNMTty+G1C+tyHi54u5UTLAHtz0oB2diT07s7m5xV9pKGRWxBEnpRov58z8SWRVmF3MDHs2JSmmA0PEgrKwXl3pimOlizEGdB49k9MBCmM+vEjxmsa0WGuclFjjPIGNfZPWQjIOmvPV1QhrVIQEQu4aTUEoSakC6dZMRDzWgN/iAuOxSrLRj97ULFQ2lAhaPY1ujCDA9gbEPFNwG5Xc8J8fn7w3kqzB8Yv5xHFrLAkgQxtvLmrdf//nhL8f9ujbTjHRjHMHJzg27yRpAmJc52Qx1AcZwOozNEb6N0B9p18i3G2BHRyaGIuuqYlZUHUBg6w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2932.eurprd03.prod.outlook.com (2603:10a6:206:24::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 18 Nov 2021 09:07:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 09:07:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 10:07:36 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [ELa++gYhXDLzRSIKN2oPAlkUqyWrXIKu] X-ClientProxiedBy: AM3PR05CA0151.eurprd05.prod.outlook.com (2603:10a6:207:3::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211118090739.223446-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM3PR05CA0151.eurprd05.prod.outlook.com (2603:10a6:207:3::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 09:07:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c514f43-7bb4-40ef-5fed-08d9aa72e6fd X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wolu1z8CWDBHsuHSW6Ymx/qsbJc61dL01XHXcnCC4tMUTkyUqrwYCIjWjj2WYXtOEmNlO0KYJEe7peHxx9tn7U8hvoqWlbJ6IkI2jFZ045AZOaaMHneriQGQFc5PmS4uG6IXT+1/5b5t4sy9P1+A+4Qqlfej1x0vnq98YAu4sp+EEhN+51LIMsy09hwIeGcGLJHS0bkptu3sUsRcPbHGKPwYAkueH8JCeV7bzr2t7pLlyLIRzhrbTCXQdAf2/M0gI/TzCs2IRrmPKWK5IyFa5Z/CU+gO4UI89dP5isPesHI7bT0njnURQHDFxgOpWpnr8l2CNWIqZ791Eq+gyhh3xBggB8QlHyuhhQ0D/3Ksy/0e3Xw8KZSlD3AOtxPR17TvElJB/UXTbAV96lN6t2j4jeTvw8DCVS0mBKqoqGLrTTMqKELf1r01kdJsRBlGdwoiPft+Ly8jD/33A2MuPAlWXCw1A8XgXp8KCCIJKZcGX3oqkp0G6gAGVKG37MK1tzA4tFuHtoW1RTGMCpmfhauOB4b77esx7uQk+QaXzGIexHCervkWCAEIVrYpvUesstxqJk9QMVGwPbpIHXUmeIDHoyYScyvJYgUrNzWj2PA5N+R7E4RAtMuys9vU/aWyadpcfY63UuND87otCfo6xmcsZ6rYKngWRfe2PMl22lvWOtEEnImKzV/PeCfmmd0ighZM8+BE5p8BXlrTPFiR4IachE6B45BoMIvUgZcHyL1cGadqKYoeD76F6sCyma5RAFnOEJk= X-MS-TrafficTypeDiagnostic: AM5PR03MB2932: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F7EY3ErmF7qciEVSSzowwWJ7Jmix3Sn5oe4fG1Q1n96l7KR3RZgzgDj7BtXPbNTaRZf1mL2A1Hij+WtgtSI/yfqnUXFX0K2i8FpNdrZttQpPcan8k3laHvmaNh2u8BT6PIMN1VAku9aMqI5gC5kdkhy3KOAO11SQOknxFKywZSKm48NAqfbzA0CRffmgVXutX2rNNHPJrPusL2O7GoNz33kTK6ZhAF40eZa+sy1Yj1ydpaiS6cKZE/TJzuHVmEutxBl5vcBtD6zNlI7Us6VzWJ50+BNRmJHT7WUBMBHX4PfU5DxJnh7y1FH1nlTHkGpLwGkI72hKBU+KlpcwvYhvdeUgL2kU0MfzIaX5FWDHvZphgODsealCl2qr+KqMGBgwmSnURiviyo3WTSGN1d7JqkRJ1EWaYifgcSGC9jP7z2y6mcPs67r7Zw/ZlRDPyBrC2fWZbHuwvmnITIQknTDwTJHap6DuGUndrTEKLeIyO1GV9RT7gYpvFnmWwWbUgrgh+9zzzsib9BxZatL5dYvlB0y8Leo1FZDVTON41Y0BacM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KqPGzdeFpKl83+aYKOlEt50yAGmt6K/kkkvpyDFtwdS44hxnwwy512n6JbR7BkEY5lgPqVulcnf2S+G4pW7ph9Imo5DmosBmt17VOSxTbjwlf8LfqW2hnvfjtfoTCaKWHOy7/urehutBAXHi60mZfzns4FotCAqS5cx0bVa34jR+wnepGhWVUB+XfFQqAH3YIVtZ9Bf8STTDPITjMYkZ1HPRGlbBOuWixaxe5a3xmiiKDQf/Lx4Cd/GN8ntfxhBmNSiWQSC/6HC71LXCf+oGMXhGDSywVtZi3Zv367Px6uH0Vjap28rILp9uRjX+B6ViwQZsYl5khfviDe8Ncfl74bOCjj8+bPwTeD7Nj5nF3lrPKaPGX1uuwJseRAq+1Zaa3m3kgzGoGFI6IViG3hOwZ1xOdKpd42se+p3oMHoRQzehYjLyP/zSYQOl7Bod4VGLTiKWThLy/T7vxDc57dU+QTxPBmOVJXtoVqiOePMT6SBqnPHrMOLVM1krHtV8GclZldsu8BhMkZq8wt5FxgLM/Sqk2W1w97FXpJ8AeSa6dMldVH7wK1QZNb5S1ARhXBwp8qvkKSHIfSPWpLcEIhUaCUWKyImXJI2Y6z1HtmBW2km6ly7RazkWbC857wd4L0rHd/rfZVR52zXFmPN2FHoX7i0xs3ZXmsmkfz6E/d2bqsn7L50se9LjzkdRg8qcOrZQG1cthx1VeTYSly7So8ZV7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c514f43-7bb4-40ef-5fed-08d9aa72e6fd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 09:07:53.0802 (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: AM5PR03MB2932 Subject: [FFmpeg-devel] [PATCH 1/4] fftools/cmdutils: Fix undefined 1 << 31 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: jn2izKaZjwVX Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 594eeef379..f80c361eba 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1823,7 +1823,7 @@ int show_sample_fmts(void *optctx, const char *opt, const char *arg) int show_dispositions(void *optctx, const char *opt, const char *arg) { for (int i = 0; i < 32; i++) { - const char *str = av_disposition_to_string(1 << i); + const char *str = av_disposition_to_string(1U << i); if (str) printf("%s\n", str); } From patchwork Thu Nov 18 09:13:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp503401iob; Thu, 18 Nov 2021 01:14:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyyLzvEcn+zc9QwPHZezKpTXvQ46pFMSckXG/y7XciXyFd57hf3KIfCCkiGnkSVd0WQqX9 X-Received: by 2002:a17:906:9753:: with SMTP id o19mr32099943ejy.513.1637226856510; Thu, 18 Nov 2021 01:14:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h18si7412989edb.191.2021.11.18.01.14.16; Thu, 18 Nov 2021 01:14:16 -0800 (PST) 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=ChEt47KC; 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 3024268AF2C; Thu, 18 Nov 2021 11:14:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2057.outbound.protection.outlook.com [40.92.90.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88C7968AE8D for ; Thu, 18 Nov 2021 11:14:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFNA0NVXKOs0WH5H+XwmVfb0wghIGNrAzLzezg+e/ZtxCRrJG9s6QeK19BlvJ8H0/2RxPM2ycIm1inwyYSdN9FvWVYKVPszJn0yKsAkyYLcdgnAzRUNaGiwFJqo1dp4WlRWpKgCPGrVmwR7mVcZA3CuwOKQARgWvaCTaiDhAWr3buntwZezyeqKNLmYuaJ/k9IFCiqrNekcRpCf+bCFKL/yuQ1WLbjTi8Y2WgATJUCHdwli0OD0nGaWa3Glq5qQlEd9wvfageQYCtUPCi/qDB3ISBi4wNAkSADMAsZlhxT/opWRveUDTtTDB9ssQATl2cIqrg7FZ5AnZqjyRyMmOlQ== 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=0XiiABbgJWIHot8UeHgThYtuk216nofeowvKYp0+fwQ=; b=C6lp8yyAiv7zgfXKEFkuorkMczFGYtzoqXDMRVEz8SZ/si/U3W4D+hLczNrG4q7oO8kCyFOcuugq6JTCQzx5rHgy61TY0sP9Az2TmrxsSqCDXL/Zyura6Yx/n45RbSrG4SUCG892yPik0QpnEyUXGU5v/2zNrYiqwn7CANfsfIZVvSHfABKN20oAAV5BtdZvj90RtsZHd+Zl9UU3ecl6JOmyu6pcMEb0J5Y8T70NGTcMUe0o9jLX/G/ovGI8+YLimz3Q/LsaBglQBrYnC7/FJTEN+7Ecn47LMXbGp5G9IthXYEQ9Q+5o1pGT+zkfz93x0GDcDDu7Wq3+9I2DVb9URg== 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=0XiiABbgJWIHot8UeHgThYtuk216nofeowvKYp0+fwQ=; b=ChEt47KCUbt6kBzYEgrG9Fcg2n/Vhg7BTeC1X2bG+vIE5yotz6rVfQ68wUS+OQPmMv3u1KPG97r/k9mAhtwGXekTIHAUjzHqWQYhiSt2ejh/Jsii2DFj/nK3ApkszhP+cFLLJxLhyvBqiOUZnUQ9sr9cYlje/ZpJ9qiyV8D1u3dqY2HsrXL0v5wqq2tcKyP3vwtGtL8NQ5EPvtA1Jh5rx9k60BvyWormAHS9IVb7Bbvn6crE94gj2whKAxLh5OnHTZcJqoYnVMz8YPiSjKpWJhoYuHzx/meYM6Cja348zJLG8/jCXEC+hTtBnWCuhcQx41zrKrS50drbyxfoNQ8Vyw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3862.eurprd03.prod.outlook.com (2603:10a6:20b:17::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 18 Nov 2021 09:14:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 09:14:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 10:13:55 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [FeEjJ1DTXgVLsXb+k1Mkkz/uJnF47cHS] X-ClientProxiedBy: AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211118091357.223580-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 09:14:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a050ad14-2773-433e-a01d-08d9aa73c4da X-MS-Exchange-SLBlob-MailProps: 3tYrFWTD79D5n4X4KQGPxo/zYNsPoVHWmR0hzH0BsXP/MEABG9yQEnByY3qoHH+7n5A/YAh/tZ1Cw5psNyre7Y2M48IUd9+SYOl9rfxxd1YXAQg73z2gAJawnC1xg6Lk/r8cZ9VDfks377QzsuFhsrBNLop8DX2gzWHj85Cb5A7zSi9Zsb70ZdHWmyRVS2fGrzYnrhyiED8b1+9lG6Uipd/oB4B5G08T++DJYuEZJXkuG0cXXeopAdV4LujbChQqhpeQcZYFIYXhBbVtN8082uKCPBE8R/FIvvCf/VVLMkC7vSAUGVfcteWXnFMrggLtiembwTjrcfdJTmFG7IPaObhn2fweL2cIf+Lui2E+mt0PxJmbNtYT2fLuyEXVOLJLBNgwrgutdiyvSCZYzb5cScZkVRW3pv8G6gKafXPgXa9XUi3VVPkXegxFN9DQrZgXEB7R5m9ZOtexZmoeYupcS6hsSVW6bxdnPstCrRV5VfIAvIxs62ar/Q0FFLdrogN3RDeA9btvNocHn70ClzDYtuKerFHKJixbmsKgw50evJmHi5kBx2MU+JibqhY9oQ73Aaq3nvz0APLENrhI5xn5fUMnehFFtvPIdSeqH6aVAWWbMryrWeaiIQhLmwT4ZYfPj9Ysqm9UkAmOQ5tUOOaoIn9FIgxBY+hqNWzMDPQDbzoRcWHOxhBc/R5LB5J3XUBJrR84FK/eqXVifDdNmHQG2VzGdQ/qpdF4HjVLa43x/i77EaIWwTzs+bdUgBh8mtWrOInrFYADLU1It+YFRAKS3AA0IZHw73F+ X-MS-TrafficTypeDiagnostic: AM6PR03MB3862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iUwrn3L3nRoXX5P+dSKW/aGKXD/e9RpJmbZkaLvEBeHmMQFNIOJO7tHAumxJ9OEQxdW5roKS57VOAvapKGg646SxJ5VjRKWWrkLJF5nNLBF73o15c9pE5JjoaxAZ8mkSUCUuhm+7fGmsIh9LG9CBOXwaJbxHsxzkUgXhByWBRzSFV6XxyBlAhaLTPmTIgBcibmbE2HTb9tjoe+hC9OpTwUQug0j86OkGOdEMw9hQM8kQZTzdsK1Ql9fGbA012d5WsKtE5jv2c/OmVdmxueTxJqDXzsjIBERX1HNuVWyFMRWZ/J/cmikct8mPrCDd6FL+1K2VQRhzSA6/37aDDBIi+GxfstzqO3PcIhudqxmQh0+X6PWz/Z1yxdy9czvBRhXHXRUIBREL5aBPUseL1K83dhcFf2sFU7EHZCGVoLlmmZfcj6ibZQ91In8EFeobg05mNefx3stNFsvWdlyIW2PyXzq4W9yG0u/aJkQ4v6GAZrsGHweeAmeXdapQu3zsAPU3V8/0/Rp8XNe5yI82oMRnr4lhX977o8hAFiLPgfGq1Ho= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IVScK46CT6xuteL5Ci/fx/UftBT9KBE3Svu5n+qDtEjPs1y/XZCDKZ4b8lRNSfQrn6LnjC/gKeAa17CQ+eVDV1Vz5UMJ+e+hwlEnos4enSl3lofZ6HjLANqUItBSmrnA/5LN2bMEAh3Uq9feYxLfzi1lbUFm9WIwJvjqh8LcBhzDtkaTaBcBfTRhIVPPuq0xBWYcGFC4KABNl/KxAW62mr+uCrI27rYx1GJAeR0qPmfQZgOcADGP2QfXlcy3KVou5A3Q2sEVRQHjljIEA3dgA3rMy+CogsrkRvhynO3iJArk2i6DJeVNBcelGg7ad+QByHd5MMl/yGhcc9m/9/joOyVOYp3+cEa1vYh0WVnJWhwcM86aX6vDj432u/nlof7mzLuqX8z+q1B78FklIm91CvRj8giJd3QsZZTaW0sj2lnvW6rb7GkQE/yPBLd5mZX/TSQB3cPpwsXKAJGa+dIa7hUm9J22OsW+i4RnbaOeH2/T9bOmj4xzJ7BA8V1GkELmmJqUiVXXirFyZrk8Txf9Wvgxww6uONHE7sN3nbi/d+1UfF6zKGkbaCMRTbriq8gm3BClJ7btanhdn3JDd9NLrK0IUOEfl3WpeJEeSWi20VVYqw7QulNTXEMSjFPLGRjS+Pmh878QCIH1jxTfEa96Dp4ALcVkaiM9VP5JY4xWQwBjNOR/dPklvXbXBDWgr+zf9yos2kO2Ww4tM3bKJ8t9sg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a050ad14-2773-433e-a01d-08d9aa73c4da X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 09:14:05.3564 (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: AM6PR03MB3862 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/utils: Remove duplicated AV_DISPOSITION_FOO <-> "foo" table 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: XRcCd/pup8KE Instead reuse stream_options. Signed-off-by: Andreas Rheinhardt --- If one used a named variable for the AVOption.unit values, one could simplify the check in option_is_disposition() to a pointer comparison. libavformat/utils.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6eac3f721e..7840e8717c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1985,34 +1985,17 @@ void ff_format_set_url(AVFormatContext *s, char *url) s->url = url; } -static const struct { - const char *str; - int disposition; -} dispositions[] = { - { "default", AV_DISPOSITION_DEFAULT }, - { "dub", AV_DISPOSITION_DUB }, - { "original", AV_DISPOSITION_ORIGINAL }, - { "comment", AV_DISPOSITION_COMMENT }, - { "lyrics", AV_DISPOSITION_LYRICS }, - { "karaoke", AV_DISPOSITION_KARAOKE }, - { "forced", AV_DISPOSITION_FORCED }, - { "hearing_impaired", AV_DISPOSITION_HEARING_IMPAIRED }, - { "visual_impaired", AV_DISPOSITION_VISUAL_IMPAIRED }, - { "clean_effects", AV_DISPOSITION_CLEAN_EFFECTS }, - { "attached_pic", AV_DISPOSITION_ATTACHED_PIC }, - { "timed_thumbnails", AV_DISPOSITION_TIMED_THUMBNAILS }, - { "captions", AV_DISPOSITION_CAPTIONS }, - { "descriptions", AV_DISPOSITION_DESCRIPTIONS }, - { "metadata", AV_DISPOSITION_METADATA }, - { "dependent", AV_DISPOSITION_DEPENDENT }, - { "still_image", AV_DISPOSITION_STILL_IMAGE }, -}; +static int option_is_disposition(const AVOption *opt) +{ + return opt->type == AV_OPT_TYPE_CONST && + opt->unit && !strcmp(opt->unit, "disposition"); +} int av_disposition_from_string(const char *disp) { - for (int i = 0; i < FF_ARRAY_ELEMS(dispositions); i++) - if (!strcmp(disp, dispositions[i].str)) - return dispositions[i].disposition; + for (const AVOption *opt = stream_options; opt->name; opt++) + if (option_is_disposition(opt) && !strcmp(disp, opt->name)) + return opt->default_val.i64; return AVERROR(EINVAL); } @@ -2024,9 +2007,9 @@ const char *av_disposition_to_string(int disposition) return NULL; val = 1 << ff_ctz(disposition); - for (int i = 0; i < FF_ARRAY_ELEMS(dispositions); i++) - if (dispositions[i].disposition == val) - return dispositions[i].str; + for (const AVOption *opt = stream_options; opt->name; opt++) + if (option_is_disposition(opt) && opt->default_val.i64 == val) + return opt->name; return NULL; } From patchwork Thu Nov 18 09:13:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31484 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp503625iob; Thu, 18 Nov 2021 01:14:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTUEbSUglAE34ydEcmIXtdxAazDUdlZLVv6VYNEJ0pUUU1IGCEDGPNZ2wEdotqVKiSOtKV X-Received: by 2002:a05:6402:486:: with SMTP id k6mr9030361edv.315.1637226867103; Thu, 18 Nov 2021 01:14:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z2si6008897edb.580.2021.11.18.01.14.26; Thu, 18 Nov 2021 01:14:27 -0800 (PST) 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=aADDVSFu; 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 68DDC68AF33; Thu, 18 Nov 2021 11:14:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2057.outbound.protection.outlook.com [40.92.90.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A19DC68AECA for ; Thu, 18 Nov 2021 11:14:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aE1BHb0+vSZsXFx6xn8e9cGAxCczTIHfUE8Rb1SZ1OhT7oJssY2B9D1gDEHgBCAggWkqw8a8EPYU+OfJXWKTQzQyCuoRtwUMsg1edFFvkBU/7QDuOfDj7z6SbDHBAP3GOcaYzSMUXowjdYoBntq0A5A+qSweq4iWXJFRWARjZcjfEnpg+ODCfaEA3nw6G2xeMW173D45FlZ6NA3NjTSJUWvHuPdtwkhY07E1RGu9a9bkvkNOtQhEuwn26Tqe1xZiMCy7VBqF4cINvFq2h5iDsA6lQ0R1PLS/GydTqXOW1F4mzyh2Quu2y9+riTilt8hk1+fjtYtrD/6zj45kQUF69g== 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=QEJY2MxvGOvU2y+PcTBMCVR6Ezj7OgN1HRG/Wuy12Zo=; b=mUFCgle+w9OXPUnhFp0s+/IdeHkMZcwmqw6G39P1/BVd4HC9nLGUNSdgELPoQjzKW+HQFaygy4roDt+apjPs4gRs1xQSunN7TNX1d6feiqCMNdMWPheE/WvN/83PtzNmQQRctp8O4z3pp6hm6qfuUNzMjLZm0PXyHXqygx9CSTbAK0fgKgjbcw026FIXC9x2tIap8SkF6RAurZUFOJZOk97KUuDKyJ+mY2jkzMj8PBU3fMHFUyR/qBj3qSqu93LX9nmZA3LQ+sW/aFWRy1bd+7+hgnyicwjgroId+YN8joXrGDDK4ShBFIZBaFU0Lp8gih04vsAqOkRNgB3Nm96IMQ== 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=QEJY2MxvGOvU2y+PcTBMCVR6Ezj7OgN1HRG/Wuy12Zo=; b=aADDVSFuiISlFWhfe7vnuSr84QWMkWgVhdpywch4b10wboMhMlzlVcLpP0iMeKufgbbkhrMwB6easyFp8mKjsl8PvkWqeD7V8/bRY2U88xVOabtumdZr2NAxqgJK18FIhyb4utH8P5ITc0WuE9w4fAO3aBiKYZVq/APhmCgWBfgizbjenzLWw22VrrUFyA4mjPjISg5uS8+gWWkCss773ZfRIr1Lld/k/FiSOd/bZSi3MkkOjTv/dqrC1ag5ocBmcQiz16keFka+9fOlpYNqHlcWxAWAcBNvB2TJ+QUGKdy+anZvLCXvTXU+DoDitTjYrKOIiGzLQQbYqBsyoRByFg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3862.eurprd03.prod.outlook.com (2603:10a6:20b:17::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 18 Nov 2021 09:14:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 09:14:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 10:13:56 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pE+TcLOoPWhngFEByfo4+e8SqQHAaDUw] X-ClientProxiedBy: AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211118091357.223580-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 09:14:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: df2a9f8b-a623-4040-3c31-08d9aa73c815 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVakJMqjhoref1ozWknkbK7lZEMteS7uBALGUjX79hMpxcYJ7hHEN0uQcHhiiRe19zGMaezx69IdRUTbxpLLNd2PwVfQBMAMtzbasEe3RYEQ5+WWoyMMcjsAZEe6B7ykSBRwGxE13tdMyVYY1XeoYc+4YRAMqFzdAXfz/IkkO+ziTuAJCqOi8+G1PsVfnjNss34CRvI+uCqdB741mJqHnx+PTjOTzlvTC5kqSC0WhCIljg8BNFifxEmb+VDFLN+XBRMNxe1jw7vjMxusBHtH+YJWQHLl9pEPQWOcpCbup2cC65rRTjPWpWjNYBQFFU4Ghy6zaCUrm0J4OBjsQyO4q1IK9d/WdVkFj5V18GA1FpYtcWSRKwg6ih5/KPBSZr2PPZmIy6pEIL/7+c1bIIFSQ+Bh/Z/4NbfxD2OEsgguCgG5VgGevSC4fOB8VYkAEKeFipliKMZwdzah/iD+dnSSxx+dtmV3bagb24Vtdf5GeKQSueaVXwxbbKb3CrxEis5OG+wbnLgxpzhEN+SqQSH4PMvkNTD8W6KtYjSt5zp+SBeG7VwTXVVqcJRE6Vnta34kiPES5m1kqrv3gbVZFLcbHAuxpCy9z2c/Sq32Xd0Osf1qQ3YEFv/APKrWi6SA8EjMr48+6NBVi5S/i7Ul/QOm0+2lQT/T4yJLG98zE4O/EQcNiJe1WqTh3S/Fe0fjRh2cPVcO4NETGqvc6g6vBMlJhH5f+zZg6guHqs= X-MS-TrafficTypeDiagnostic: AM6PR03MB3862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n4dnU8USk6IzAL4Qh1+sEeLkQHn5cPP3+TmIdPMTcshGme4a2KMoAOGmq4VxlYNiKaxTN7l37KGZo3Cz7BetC8d1R3kMdq5QiWRGjuUeCBlTZdR4S0cHmTmkdipdu7qYmON6qNwSzE9TM9pSmr2IAg380QsVb19M49DfTOzRaedQeSR4IlN/uIRHsmIZ8WBhDlsK2g+MQa+mzLTzWOTihXrUUwj7lF9uHFU5MJQM0EmKxk48nCZ1L9CShBUlvLhG+wLIkd8/EyXBsDELHa+kmLxSwkzNPc6hzi2f0pJPTV9MPnVCpBnSBKKy36F8ObVewE8bSyi45g52SSzk5HIQMFF0VsvQH7D6ffNtHstfoHLeaxm0YPvtmLmlz7sBaKOmCGw7Adpql9IKmr99rdwPtiaFICqR2C47gZdue3s4/3NV1pFjQ9919RtD2kb4W1m6f10yRnkeJNR5YkVMcWL7iJlr0RgBdMwSwl5E+Jv5XqvaYN+buZD210/HfZMr4x9K3W0FvtQbiuCJeonp+e2q5Q8XpOOiyL72dDYlaqN4YT0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gBzJgh07baoAqRBKIqBXulUlMxfOciiXCF71mY7Lx3BfzSk5Z98neoGXeLKlhsfgqp1VFvt/tHnSIduP7K9xynYLjGdKywcgrgxn9N3qq1G0G2uyO1o4Fz2+1LAwTAPzyZLG5jKMW1TzM/cSjhgIzVJnoU/3reI/y7TGO0MuAymzB5muMBhhQVpRt67lSQ+9kn7duCoczuWYyiemYcdjksKRkeh5QfIHnB8A2HmRoRCF8ZUwYOsLKrs1VVDOa5aJY3MZbJ20JXVpkUQAZcjlKo/pf9PkU1vEPisQEfh7CmpogthynAEnoSd8NNl+DbZ1tmmHjsenVfn1v2kscml52re86ICcFvNR2Vgyllk37WD7m/dIhLyNusDYqyvsCFYbpPrjXZEDp60pTPyaGoxHR7mzczwyY1CtJlvKDbwVZoqtD8eIO1DwMYMGPd3Yg8jIVRPkRkHgrAJzF0qh4pSZdKqAoCHlBC8THM4dxuq4icRn+9VF2TR/+q2/1Nk7jW6BtpuG150ATTIURXJ7bGVnb/c9N8Gf+PbE1USr9e3wOsGDEZXGEkqyNV9dLrcij177InveY6hL9yD1BR7zX2FpPd0UWrViMvcoL6K7EoGt85zwbFqaCtLzZu9ju+9Z/ZjwsZLfqwyVXHBwJHT9o6bzWBLkxIQOPHqiMy+ysQi2hTlFuMo1U8NJoiMpAyGgMTGk17cFMFvzTlysdf4QgN4aAw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: df2a9f8b-a623-4040-3c31-08d9aa73c815 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 09:14:10.6582 (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: AM6PR03MB3862 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_huesaturation: Remove dead store 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: pzE2J2si9ID+ Fixes Coverity issue #1493345. Signed-off-by: Andreas Rheinhardt --- The x = y also looks strange. Why does the parameter x exist at all if it is immediately overwritten in the function? libavfilter/vf_huesaturation.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_huesaturation.c b/libavfilter/vf_huesaturation.c index af7ea33b9e..d4e3fea1c5 100644 --- a/libavfilter/vf_huesaturation.c +++ b/libavfilter/vf_huesaturation.c @@ -297,7 +297,6 @@ static void transform_point(float matrix[4][4], float *tx, float *ty, float *tz) { x = y; - *tx = x; *tx = x * matrix[0][0] + y * matrix[1][0] + z * matrix[2][0] + matrix[3][0]; *ty = x * matrix[0][1] + y * matrix[1][1] + z * matrix[2][1] + matrix[3][1]; *tz = x * matrix[0][2] + y * matrix[1][2] + z * matrix[2][2] + matrix[3][2]; From patchwork Thu Nov 18 09:13:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp503840iob; Thu, 18 Nov 2021 01:14:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZ/fpbyvKrE6747yq0Gk7+o+bPIj/sovBSUDtZOsH0Tgd0vxRkc3wFPRYUtctDZuAxBD5X X-Received: by 2002:a05:6402:26cb:: with SMTP id x11mr7770085edd.149.1637226877580; Thu, 18 Nov 2021 01:14:37 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x15si1474412edd.589.2021.11.18.01.14.37; Thu, 18 Nov 2021 01:14:37 -0800 (PST) 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=dseWfS8W; 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 7EC9C68AF32; Thu, 18 Nov 2021 11:14:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2073.outbound.protection.outlook.com [40.92.90.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA9DA68AECA for ; Thu, 18 Nov 2021 11:14:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgQan0KrJ/EbIqvnuAbAXb9WqU1R6FyAE7G5febHHRygljJSV5+IJDX4uRowhXP5p1IyVX58aKS4SDycyWpPJd2gMCM1fZDhSh/XTRCPj7qeDBCgiVXwQPaEfgFQbFrnREEUseRoSR11rGZHNB9kq1j/AsQqYuJWO2JVWPNyfHtyM9XSABkg5BVJwE4TvJxJxZad6VlhYBgSTaY8RyfUUSuxQoSM1O2jJgkWTlmdTjJTA47xnOsJLjicl8SVqFWNzowxxp1bnYg+BBRZtm2e6MGvGbVHUPQkTeBVoT9jDyGuSv9Ays2lKycBEx6gIAZ7bLZDRPRPs+dGn8O3hEsjUA== 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=dqeJH4ohDXY7PK7EF5TqrjcEKhrGwT1ZhZ1eWQkGoI8=; b=AYw8CEIVzntD+ky1fEPKEpJGnLGCTEEATKY2qeou3aFbUbSq1Q5kdX912PSJuUZMzQjNNMOswhM5SANNUZ0MO/v97GbpOV+L6H3D3uCZzEyETylFWJ3L5JTyVlYDf/fBwap0WsHKrtT1HOg1XOXYEl3E+Jd+gNJzr8oyFLIvVyn/oWrHAPX46jmpEw/pL/o0dDNKJsHNdvpbjiWO5FKalau1PNeUQQl/CIf4G/rOlDHFj8wiU2KHRqG6uUX+/pdkDsZqaeDdYK0fJbe0UIg9X2os2LmUeq4vdLLYQU3QOhM8jEmHTSQT6g140nG2Icz2wIph1ObB2Mve6gkGt/mOLA== 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=dqeJH4ohDXY7PK7EF5TqrjcEKhrGwT1ZhZ1eWQkGoI8=; b=dseWfS8WAouRNbQaw339UsrZe27Yq19ZzONRE2Oz3zFXPX5hMT2V5NWOObSq91+IvtvjLcULSNOSy8B0xJ9GxfuwMsQM5bkpsXLA8xnYOKZ5gZnVh1Lo8DV2rpGOsBN8RH8vS62MmwKjswEEQqKK4eQdosgrbtxAe3k/kGP+2tH5HsgSCPPeqU2UL1vRWatRrH+icIiqEUOSsRKt6n74vZl1UWjUFb458wj/DecRZG6xRV7nN/I0whlGh+jzYt3ObpQyLgviR7iopHS9UwgNPCZQ79RwSgiW/yYJUJ+SzPe2z0nvMFh13KiewN+s3LYD1bEUygp9oRc3efmWZSl1Hg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5703.eurprd03.prod.outlook.com (2603:10a6:20b:fb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Thu, 18 Nov 2021 09:14:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 09:14:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 10:13:57 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [gCQlQR63hvKwJjvchR97vAX4MuPs0vEI] X-ClientProxiedBy: AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211118091357.223580-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 09:14:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a84641c-22e7-448a-a915-08d9aa73cb21 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRs85NybYSQmoa5lJW+KeisarAnMn51rzW/fZtnWcU0s+Vhn7cv7OjB/AMn5J0mo6koHdU5qS/jZm8VhKUaZV4Sa2+9jepRRPP6oennKTAyIb42E1XCeNVjILy/b+kV05b1sZNaT1gciP+6wgz25lf6pOGCPxHGw3or1VTSVxpGhnr0onwi9Oog4IvSQK+wBU2LwPps7Z/9Bc7S/wLVXw5YLZqHuzJeKBDCDfkuxvCrFdI4wPbnOdxWYFGy0me6LlLpVL7ZNcf3UOCn/9R5x44N9NLVpgn55tmGAYg1mGyMh4LRmmEXRFNBQATuwtw8SV3uC1ndxHjDuZQcsNXWB39jAmR+tn7js9chQW+pVeYbw/QCE8fHQ2EIInfUSs4oATMVdb/GcC42I8jpU7Mhe4y2RfPo3+BlGm37KtBt58dTEiM7t7vESa3Tq9tO2hROkgV8Lh/cXPATVT7OAnssltvYWT7e7tEu5jcBbxvqeV2Mjtfr25HD72DU6MjkbN+7HNbXpEV03AJhzBp0CueQTeZkXUugwcTnOAtk1SHvhqRud8ZAOM++jLqCwHJbGsbKxrbc+TSY9M6hF8EdBfMGsw1pmipzBtQSLQo9/vK31nEQVFcGI9t7Kdn95tYdsnb3L95bDeOToTMKs2piliupNKKDEQoPbV5gmCqWtdtaAE5XyU6EhD7mmZuicV9qtO982VQkqd/R31yPEctSC4TIndPbYs2Jzo/8lfYmvWo7IW3ODNyMKg5xvqiQYC0Z4h5NS00= X-MS-TrafficTypeDiagnostic: AM6PR03MB5703: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jNHS2zNyuXAewArj3vWbwd2ycU+ezLdGfTL9WaRSeor+xNCiYcvCRKI7WxQa2mFtPmZRTt42Ey6wvoWKHs2eWe1GIsb5iOMo/w9tqa+Q/n7nNKDYE9pA+vnD85CPYvCh258EqBDdf5nLxvRvzBavk95h82oQOzAbwrMNFkJ0jwUGVBCL26jZtOalLZkwoSQUrZgMzPd2xVhZ7sCb5Xfeh2pFxeaM0L0wNEKmHy2guoRze1EGhJjly46Ngayt+C60pMVabPta2xpZm8Fi6I7wrzteZQCs5uUk/i1YLgNNcYmJItrXP9zmQ1ffGFKl2VSBC+3tvs53cYWMNNWWHI6+o649Hbdv257as8u0GkrmDtbz0qX3n78naQUH/H90gjf/j48kR95I+2ZgFn6V2KmJ22Qac2pq/k8aS2TjOOeyEvW2Z9h/IthcnUriQnLYWWBzpBCsankwzr5v24X/kTR5hcbQgX7bkU8By+TiCb1l4kGNpMXFmVUE8YCdYRB2AMM9LM9IMyPouxr98AUmNvxMOEEHYub+ClRUrdx6Svkp2aI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k+qZM4LtrMnajxmG1K9I92h0wMW1nCXKKTUGUFQJi+6nB1HP2uhm0ytDDIIRV2nj4fNkniISw6f2i7gcf7gUH8iBqmRIibKXMdEtCEmxe54XSBh+s4F2N1nEYwJGwh0UzIIkr8W4/y0y99qQuk26evvX3kWbzHd6DlFIW/4uAx/G17twtWtpcN2HoU34cBNENj/WWt7OKBrxa56v/RTr/LJL5qwJphvbUogokV5S0h0H3E3+Llbn7RZQnfTvT/BI95vfr4oIupYKJqRRQI1Z7R6Xr/3umae/vDVdVN54gTZw91nXYyHVGAFuLZgDAiLZzwqMeC89wVOkUQkc5NaBwUIFkYOMZonOlMiOCIgysKtka1mBi8H8FH7bxUXQlA6UQwJfzemrSKmsSQ0N5bfVVd1YxovcsUHsgdv05ohFAfJdKRBpuItmT2i1FnSJfen/qe0IBZ0BX3os9EDQlOWh3hHz9JlL698dxXDIEeVJxd5k6GBomVGvSWlJMhxI8kwXyeK9YRrbrrWyuEXV1ZjzTSKHGWrhXf3xPn9UgZKSpD0nJU2Cqs1vMUHMDwjMt/+pyVlZ3t8Y4u0EU4aGj57+nLB/vNmXwSIoeuy+EP23IYWRFEP+s1JEC8cd/mIP1u3UsfGbaj708ErUUelB+oUBkeQHlDenX3cPNT6/S3UR8hpCKyG8npth8ORNkQ3Cbevb5vpUpWbA2BPYn++lNnATxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a84641c-22e7-448a-a915-08d9aa73cb21 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 09:14:15.7678 (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: AM6PR03MB5703 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mobiclip: Rewrite code to make it more clearer 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: jwRfnDCeYCkp In order to know that the earlier code did not use uninitialized values one needs to know that the lowest four bits of each used value of pframe_block4x4_coefficients_tab do not vanish identically. E.g. Coverity did not get this and warned about it in ticket #1466632. Fix this by slightly rewriting the code. Signed-off-by: Andreas Rheinhardt --- libavcodec/mobiclip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index 6ea1c3eefa..23d64f76f6 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -491,7 +491,7 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame, int ret, idx = get_ue_golomb_31(gb); if (idx == 0) { - ret = add_coefficients(avctx, frame, bx, by, size, plane); + return add_coefficients(avctx, frame, bx, by, size, plane); } else if ((unsigned)idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) { int flags = pframe_block4x4_coefficients_tab[idx]; @@ -505,11 +505,10 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame, flags >>= 1; } } + return 0; } else { - ret = AVERROR_INVALIDDATA; + return AVERROR_INVALIDDATA; } - - return ret; } static int adjust(int x, int size)