From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 74F8A44A06 for ; Thu, 29 Sep 2022 21:04:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3828A68BB21; Fri, 30 Sep 2022 00:04:12 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073079.outbound.protection.outlook.com [40.92.73.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 923CA68B6BE for ; Fri, 30 Sep 2022 00:04:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mO5yTksjYJ2bPH7Vt/PfEZP+t+Oxx7yY24wFwsk2MPPV0xDEas/FEacLjigAWgksqdyWsgf2y9b1uEo3ATvfMpBGdqp4SI13pHkVjhOpl97raFup2cRMtBhHrUFlW2zIYu5Ot+qplUZz+MOlYKDD6hKfN6GG0+HA0ra7B9PeiVqyeWFF45hC/OmwKAxJ0ynRZNMxQh5mvRLIRnbpNOZ+P1kzlMlkW6/BQTJSPcFOSh9doVBfLCR6+BcMkbmob1Cl0Aj/8ThMT2UqNUn1QLmAzeq8R0TWXwzOMtsH2dVIR9XF1a9KAZ9JYv9HQURteeOW/5NbkaEfnHzmweuvm0MgyA== 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=Ow/RbJ7pl+0Kw9k+3jTtH+DVkX2EUfVaCsOf0J77nhQ=; b=HjK5HIjUw1m/YPZZwth+RSHjSQYt14NFNNf2+hQxcTcN6/hT9RveluRv7wqtSdUaMImeMP2rmspZNYeqTN07uXNRnN/nWuccyGaLnCR92MiEfR7Nds3Plhu+JWo7RxcX/S5NGLVo65Dn3ae2KgaU2DdT4r6//AtyjEQYn7SVmungK4Mf+pOOj9ZZ4L0gQhvL65IsU8/FcPNayHTg0UUtVIDqEASr5fTUe7gOgu7ddT0ypK7yRtcft3jb32pN/EDXXBmPLV54c3XIyPapOEMbJojHB1vhf567nNDkBoosBfTEXZ6F2fNWKUs0VgP2cIr4bAVE+YJfJrvrEHaHNAh07g== 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=Ow/RbJ7pl+0Kw9k+3jTtH+DVkX2EUfVaCsOf0J77nhQ=; b=l5X7SztxRPv59IRY9fecpSK9X7WHYtMP01WRUT3utg/VS6ZiqJ9MhQqc2hHSHK4+sgqd1VjynzYl0Ac0A2EGTIyJbzxk7lMIYrW5NOK1R/NUXymuNr2+3NmVdp29BIgAWgEPawIQlGDhp0kYy2JoGIXMcacsrr6Y+Hsm99uvFAk7YA9JDTq1NMPOle/1xkXR4H+PuxRRK0P8C5dqaa/rjXILWqttdMf5xyd3A74lp3TrJAvDf09V0PolB5DxknS2HbAZAAHpWpMVUfJo3wk2q9FS/WOf/zDVevYxKnzhHKL4lWEC1KrT51HgFV5QrQS9C8ksJhWS7HVTPGLHrSAEiA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0321.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Thu, 29 Sep 2022 21:04:03 +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; Thu, 29 Sep 2022 21:04:03 +0000 Message-ID: Date: Thu, 29 Sep 2022 23:04:08 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [l7hsmwHrruXgtu7flkIOGrn/hW2RvusIncD5YbM16Xg=] X-ClientProxiedBy: AS9PR07CA0026.eurprd07.prod.outlook.com (2603:10a6:20b:46c::31) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0321:EE_ X-MS-Office365-Filtering-Correlation-Id: 66c62efd-9fff-4271-8434-08daa25e2398 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 97aKnkACMh6uclF18mPZytGeojQ8WBXa5tMG2J+FNXVKicDelZwMSLLnTxVfnFlmfP0DzyOaSxmXHX1/ci5r8o2BrA93TjGdRwgJPmibDs1W60WRxjXQmgbaxoFu+9XqwJq4CEALnpnVhuB4ky3fFf8nk/bz/pDD/fd5zjrmllU7Jh5LKM+O0V+Kd9zIrP3o8X1mYfcajWxlefL0JdzMN04g8WWiREDm8bLXhEM9+wH40T1vzwVJ+ugkQw7FxiyBo+W33eg1ieqHBPWC/B/F2p5YqHMumfQRPGB44aVBuA1csbLs1M9422SntSXFH1J4kN3SXnjWj5x/zHchq9PC9JP8eM5ww3Ayc6KyzD7+dCXM7Z4ryJTP3TxzYRV+53ThGl67GByPGX6G7E5xlAaIA5Nq5lXJd2dOswPeJ1Jc5Dg+JZ3r6iAmhl6GB8Lf6demgKxFLa0vQ/UnmiP8mCVZudbvYnDX6r3dnqzZqz/ZIz8/N7wF1EHdYwnEh7/xalhD+DwoEC+sASh5txzXV2uknHrPne/wWhAZZSXXbYxh844nGCkhURw81CwiAIzx5vXSNC3PPwwsyrFlCQLvRyPheyZKxLD0tYmVArV+qNQD66KMEZ05r6KTYWoqhOdf9JrZkQQQGIT2jbFM01Z0hYqcHEDugtza9JmVALxMTM3gQPyfU7UYfuRcs0hIJKsut0Xb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TXR0U1dTdlBtT0I2V0FxekZuTXh6VDRQampHYTZaZTFQY1YwQUVSZjJHQkVE?= =?utf-8?B?MDNpSmFnRzBId1hnMmRIeVYwV1U3UUlKNTlzbzAvT0t4OWg4eDFMdHJmVnd6?= =?utf-8?B?Sk0yVGJnbEZFWDAvVjRxMm13QVBlQlpPcW1DMlJ6WGcvdGF1Z09uZm9zdEcw?= =?utf-8?B?L1Q2WnlmVGwxR21ueXVYUHgrZ05yc0UyU21EUXZ4WmIzeWVGa3F4elZIMlhB?= =?utf-8?B?WFMyL0ZCbkJmQkU1alE0SGJ1b3NxWVFTTHdUdzlyVjNyZXgxS2tucU5IUEh2?= =?utf-8?B?alBhaXlna3dCeFVWa2pQK0FyaDN0ZGRpVFlDeFRjNFBWMHNwcVpjRCtRMGlU?= =?utf-8?B?a25zMEF5SS9ML1FyV0xpWUZBcXBvdmdodGh6UnRRTm1PS3FaSnV0aEwxOFVj?= =?utf-8?B?aDFiSGwvenNGT2NFZHk4b2VXajZvMjdqSWdBOUhEYXl6cEgwa3lSZ3lyZjYx?= =?utf-8?B?YmkxWndwTndITmJNOHdQTWIwT1ZYbXZ3d01oU01TRTdGMGxmU3pSUGVkNkZU?= =?utf-8?B?RkZuTElnS0Frd29oVFJDOXFVS0R6L0FRdTNKeEJ4M3VEZHJPUUx3ZU4vanZT?= =?utf-8?B?M0Y0RGtib0l1TU9zazA3UkJveVJMVm5NRTJwN1BBMXpwZlV4RUFFWnhVMFF6?= =?utf-8?B?M1lYc0dKZmxVclMyZnAzeWRQd2RtcTBzR3VMVGxXUUhjdW04VmFYa2d2djA2?= =?utf-8?B?T3FOWmU0Z3ZXalY2NmhwaW0zWUVqcy8weXpGZkxLYUxLbTdJMWRvcDE4UDMy?= =?utf-8?B?ZlF4TENyVnZubDRpaXNXQUZ5U0FsNG85VXg4RW1TQWJWdHBsNkd6OXJrS1cy?= =?utf-8?B?emhTM0Z3aVZ3ekJpczUvM3BwYUtxaVAvc0JzMHUxSXZUQUhIaUdJRUhFckh0?= =?utf-8?B?SHVJK0NjWURJTCtIUE4wYkg4a3NLQ284ejN3QzJMaFJlVG84Y2dzUnVWOURZ?= =?utf-8?B?NTdIRndvcXA3cjg0SWh2WG1BamFNTVdLZFJDTWJqS2gzZ3Q5M1Z5K0E2c2hw?= =?utf-8?B?UjNLRWFVaWlYbjdxMTZVQTZIeEZhVER6OTcvUGE5RzZ1L2VEV0tOWFZIWW1z?= =?utf-8?B?S1p2MG54ZEVFVW56dm9DdkJxdDFBZUhRNitsV3VCbnVGTmZjaHBRVlQ1dmNT?= =?utf-8?B?QVFaNEY3cC8xS2F4dDdMQUtiamFMOGZ6TE5uWk94aHgzMWp6ZGN0VDdER0Vw?= =?utf-8?B?ODVxdVJKZGpta1FHd0FVZlhlVTBnelA3YkJZaFhvYnFaaW0wYW5jdmhOc2dn?= =?utf-8?B?RkFuRnI0V1BEWXozSkdXcURmWWJiUVBRbElaNU10YlNQMFJSQnJ4L05VNFc2?= =?utf-8?B?Zk5XRFNWakRQUTVhRlpzL0FhNVZNN3FJWm53WGZWa3llNDQ2Nk1IZEcyeUJB?= =?utf-8?B?Y0N5SkJid2g0dTVCMEFHeUc3MFh2VVNJUHFmYVJreVlXWlV5RTVXQ0xDQ3lE?= =?utf-8?B?RXZNSmtHRnk5ckp3VHlEc0w2N0dzVlB1SFArbWNOZXJjTjR0UElxSURIY0Rq?= =?utf-8?B?dTdpcGxmOGZvcjZ4NlBVRUxiK0dPOWRTTmlwUDNMa1JWd1JNd1lMN1VTTGRH?= =?utf-8?B?cm41Z044T2w5L3JaSnVpWlJENGtIck4xTnNyYko4MUZ2cXhmdXZucFk5YnhZ?= =?utf-8?B?MlBtODB5cy9ad0pwVXlKTmM0bGlnUS94V3UwdHNqM3lHb0t3RWx6V3NMZ0o5?= =?utf-8?B?emgzTHpnMmc0N05lVHhmQkNBenpCWFNMMEtqUG9QVit6ZHdQemxSMzJweUd4?= =?utf-8?Q?/LSBFYBoEaKzWQGSPQPQzF4YM+XnOHkwqsYpX+N?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66c62efd-9fff-4271-8434-08daa25e2398 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 21:04:03.7451 (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: PR3P250MB0321 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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++) { Will apply this patchset (with the issue pointed out by Anton fixed) tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".