From patchwork Mon Sep 26 19:57:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp48623pzh; Mon, 26 Sep 2022 12:57:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5baMykfpIc6bDLCpNdDH2Q8XrFb8gQaZrfyMau7vkeQG1lBmHNtlOFLx0AWB2tlwYniLsi X-Received: by 2002:a05:6402:1910:b0:450:fb10:fddf with SMTP id e16-20020a056402191000b00450fb10fddfmr24065466edz.321.1664222261317; Mon, 26 Sep 2022 12:57:41 -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 qb7-20020a1709077e8700b0077b49a2aca5si1076563ejc.393.2022.09.26.12.57.40; Mon, 26 Sep 2022 12:57:41 -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=qIq1CxqS; 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 C927368B808; Mon, 26 Sep 2022 22:57:36 +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-am6eur05olkn2072.outbound.protection.outlook.com [40.92.91.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E71AC68B0A6 for ; Mon, 26 Sep 2022 22:57:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cmu43eUcLBLVA5VXW3nMoTBn6gFCRzzLjH1xxttQv5Pq4K/eBleXlMC0pOqVwI0ivtaYtfRQ4skDoWUVNvAUvwwT57aR90mwHKzi7X79oo9qV/6NP/g+Lx0HPEGTdIPewWRd33FAL/Trlvj5r1VyBkCZXJykculCv8dcY8dr4dUtzH0ybYBoL7b4mg/yZKo2poT7FoKHIQ+xFHMboQSwyYwuagHt62C3zMl3Wt5N5ciALUYec9EKfCABRlsmXoEyM/SYIOh5tnfPZtj5AZFF1zVmMJoJuhUujia8m9eWJ2udJrhqfA05lVOvK3ZFbZ4QMgkZ5FSXmIApRXaGqH8o5g== 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=mUh105yxW2QMHE0QzVXMvoEjtBLUhs1ywMi+fcUPdYw=; b=GhrRsdb/ee4xFW/I+EuPawa7OykQA7l6OR88H/Dn8LIGSlmSJGy7slPQ9Z77Aa/DBeBd0eMwOSNY/6z2hryGoSmgA7StdD96TPJfqWbgyUNi3TScP/bWOgFtDeWOeHsp55Ov/yi4COA2+Fwv/h8/ZYu9cXdso8NpEbO8muVbn4PTZHPFIqu/qoboKA2BDU64HkZsksRqQQgq8Sz4G8maZcYX5TphtnJVDv+Wqz2wKu+yPaJtOtu/QDV76E2pLsXfcZlt17kGL87TQZ8+ItDS4OS3tPz2YIJ+toszSHI1lB6G9fRhcvjKaZkyBGms3hiZeTNedgJsiKHpUpqWiKfEEw== 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=mUh105yxW2QMHE0QzVXMvoEjtBLUhs1ywMi+fcUPdYw=; b=qIq1CxqSc3ahoKyeJOLhxbc5AkDBevkHXrqmmj/0l5vJ0CMPobxjUqSavTkyiTeCyVV9Dzif8fQlZ1F9iGwJdW5o+ZyleUylBJCzU/mYAUhQNaIZalCBeF2m8SmS22oPMbvUrZgccLgP1JiBYNBuHpil8pSjsDkVa33l3bqOyDgfdi7AJmB9mVft+DgkJihIh9WfciXAd+7sCkIu6LC1prSJ795x21gYqU7+ZsgwAkmIgWJlzd/35ML0nDCv6222VTWj/ZkG6B8H+dWtsQVZGOfkKRuOPTy/oyZdDomxiFEf7XrnQVn4IrFc/fahH7MfITXyn2qY/0IDgZyJH5Te9Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0296.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Mon, 26 Sep 2022 19:57:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Mon, 26 Sep 2022 19:57:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 21:57:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [asOnn6Lc40qm1ee+GPDOiz7E0KF1D0Dh5ZeGpk2K+Xg=] X-ClientProxiedBy: ZR0P278CA0036.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220926195725.3838378-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0296:EE_ X-MS-Office365-Filtering-Correlation-Id: 04bd2c1f-91c8-4d6e-8e8a-08da9ff95661 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoDoqouQ984HdnI9yqZYxaIix0nDX/QTZtHCd25fX0E/e63+UrR6hrK2InTOuHobfIloXlhzgZWYF8btrFSi8dqjMNPyKcItUVqMrz4Hv3S6jlr8nxIXT6/xo9d9orKs8ODIqE+Dz0bGOi1pfKizCT4mj6X+p8y+l1FQiV7sXmoqXjm4SKiP+5l78V5/UCVtvKrWYlGHaGoq1TOYJoiQj58nWl2gF5iXWvSQeGwjsme9hxdgjLkil45jnLqwoRvR/4+M6iS4JMTlWNW6ZXnlcQDVRmOhIJvXtmQJm2eq0KvYSTJF2my6qWzQIKdLn3J/UG76F38DGtd2M3Shuo7lzMPmYDxoJrtKzBykXCr38Zpqwwt8L2GQHKnQWImq4KCOjkbZUasOmr9ljRvGKStsyh3/wXJpG9Wf29Uh13YxmHVqNKw4HAXoNusinaE/xs0tZQCAD2ccD8O+TxoBc7SjM2vi92q3n0lCiU4Cn55EFypDQeKStjLjf0BsbdhTbQMQnHKnCDWQQssaCNdYtknd5/Son5cvaGqTJ6qucKxHI+HXkSstLZhxFzQ4M4MlRZjpfIcN6Kb5qOtBmY1CTeWudyF5nermu7paVjHkA9wyJ6Ien+wuiqY9PS/ZLmt0GtHvM9JQkeARNKCZ/U/VT1tu56Xhjji0VZlbfwNkTV8J466ln14WWispDRYH2tGJu9DQVTpy7pZkvLzcJ/D9LO/4XDuXwHjOrKKvvzEoShSZYatXdvsNyYAiQxyOo4f60xhFZs= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MSHG/vW9lM2oTsjKqxEwDJlmFyhxp1mDhB6uJamWw/Ks6qUKDwxiXJ9ZNQlfNMYWbnZa+x99aAMnN7IDpBPNRyBj8ENnYD2YN4z82EJHnnNtsy74a+4OcKcwe9YD73a+YDcrVzdhmJTDVnvHhymrDHvp4ZGht64Mg5wnmzAF0z1gmaunepAY5SLJ1kuH+68m6mb0AuS625fjoYnqpxWnvYrL4yZmZXy6+AGBEG3I1Z+JPDTqvRvrbfgw3I95D435ZdwJKs5QRPeC3ROkR3YqMPRkLf6KDxePffxjl5CptgTqi2rQgNHoLgvMVF2q+cErvq1MbV1gOu+/xUTKiXKrLcGx9xzefW/xqeTHDkARtSn3zveRF/5zr35bsjliIuVRb5sYxzPzQu59pxO6BJesGAGAzU/PK8ucLHaaLUUfEgy0Vn6428JkotJxn75V/fJEzuzTiyVLKA4HS30Jtk1t56xe2RWy/C2tReEtREFmohXhReICc8cP/TzGN2lmk99g36+bF6P7XqSTuBrB+g9x7YlGt3xyCCbg/zcrhTF5cW0DHUD7dl6W8GBPfjrqiHKNZazn294k+sOV/ROk4CQqSVpLcQndVfw7UUQhgHmG2UcfV7xxkcSbYSdfpISbra6USoI2pyofPz5S66vjeUvH6Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ud8NqyB6nqgMc2LBxM6xhoaXRMq0w9zItUhJCYA2AH3q8lbC7IWUJatPTjFaroe9L7QNX8rdta3eLoQIkJRwGMWHv9THeWULfXQKzuaA4s32DDjQEiqMVw/TXrz1/+qslRoTuXr1VJfJjCciDTHKt0H66+1zg0ynlPAIPEEo4475wB+Xi8BlMwGBP1EAwyxDt8xZikhlk+wjwj+fQyIlOQoMCT2lC2QfXqm7lMwbG47dZ5vsGbJ+6NACWuI1/n3Gq39t5dU4QsW3cRFdSYR8cg8u2iEuimue38wB638eI/DGGey3GlABkH2kZGuMDKO2F81p0DKiM4QRZ9tj05dzFRoyISn3485w+jRBiLQfgHXmw4QVeJ+o9VYkEQ3eLJG9jbSssNGNtnAiy0R3+AbgUTz5+vqt1dXLUeak9spxmt6lWpakcwNydnlP7BW31kBqHwO6/tKKP44geqlvNHKP3xoosuRgtvivp5cYRyzGT/hv8/fWXaVr78+AHPPF0SRwc57XZKB2Oc2ZvhtJ/psaDiZtvPC08CfXPhrR0UT3wGia4/1MSfUlZlTI8F1ng8oOZ0NILpg/RINlfT00ahzKzvJd4J30DrviJdHvZpdjo4wS49MCjVZHzHEGZQO6/8Wm9+UZIoixwLSVi0LLxDzB//iorfBI98Sip6FUsbk5EX3U1Us8WnjaZ24JOvnSgngcbjPMYxSvRE4sNjL9we9uhhX+OJoSawXjTa3OdmovfMbmtmJbxaflPd4/S5XtfL76oVPhe/nqAX/eY1N04yclWo8izNUsh2vS4Ull8ovUkXOrh+tZf3S6cCj+XC0GOUQswrz5UNIVG105yhhDWKTsu6F3cUf0ebp3tnhwXO6sDyFF0iPHLsZZLF53A/Fa6i+tqY93TX0Nbn19qEHu2Nk1hxif2uSjyHYX6ZqH8SRLS1oy/b5tYj03grzFUBcWOkBYMLzyKfwMIWOiT2mPwZmVndaICPWJfbSEhoTUSpq5ltSxj98v4GgklVlJz0b1TmEmz+RLzMVjIe/YbYsCftAnhnRuk0fnTBGqq/u6oVkWCqh14cBHRyVdVFTq5ewRn6MDoLa+cx+uOQTZtj2zXmvO0pgNIRCrd65aJvKNRHpU8n6hnp86MFqun7Y7DDqLuDc9XDGGtI5YSYAtfMDPyU7cAEL4nul1+4i1DodO8pm/Dh3kHmBa3TFmPW5i0FvUt9rj7KTW0d8aq5LaiLxi8VVWPhzbW4sIRxwnT7eX2eGGgT5gn1EB3dQ6xX+DBMABOXH3TxkWZ1U74sPiKV0F//hvj/GlBD4IkmvAjsxzrUYfPCGFm+bf+u5Fk0j6vtiVFEQp X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04bd2c1f-91c8-4d6e-8e8a-08da9ff95661 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 19:57:27.4065 (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: AM8P250MB0296 Subject: [FFmpeg-devel] [PATCH 1/5] avutil/pixdesc: Remove always-false checks 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: EMbHIQww9lsd ff_check_pixfmt_descriptors() was added in commit 20e99a9c10cdbe9ad659dce5bdec569d744f8219. At this time, the values of enum AVPixelFormat were not contiguous; instead there was a jump from 111 to 291 (or from 115 to 295 depending upon AV_PIX_FMT_ABI_GIT_MASTER). ff_check_pixfmt_descriptors() accounts for this by skipping empty descriptors. Yet this issue no longer exists: There are no holes. The check for said holes makes GCC believe that the name can be NULL; because it is used as argument corresponding to %s in a log statement, it therefore emits a warning (since d75c4693fef51e8f0a1b88798530f4c5147ea906). Therefore this commit simply removes these checks. Also move the checks for name before the log statement. Signed-off-by: Andreas Rheinhardt --- libavutil/pixdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 3ac44614a7..c42a0242c5 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2922,13 +2922,11 @@ void ff_check_pixfmt_descriptors(void){ int linesize[4] = {0,0,0,0}; uint16_t tmp[2]; - if (!d->name && !d->nb_components && !d->log2_chroma_w && !d->log2_chroma_h && !d->flags) - continue; + av_assert0(d->name && d->name[0]); av_log(NULL, AV_LOG_INFO, "Checking: %s\n", d->name); av_assert0(d->log2_chroma_w <= 3); av_assert0(d->log2_chroma_h <= 3); av_assert0(d->nb_components <= 4); - av_assert0(d->name && d->name[0]); av_assert2(av_get_pix_fmt(d->name) == i); for (j=0; jcomp); j++) {