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 06D3248E12 for ; Wed, 28 Feb 2024 09:09:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF66C68C6A7; Wed, 28 Feb 2024 11:09:02 +0200 (EET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2053.outbound.protection.outlook.com [40.92.50.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 728B168CB9B for ; Wed, 28 Feb 2024 11:08:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XHaoQJAxrS/yLQzph6y8SRWW412ciTlvickAc5+qn2OoB/55OJjZdYAKz4VcW/B2pCwT6cQAZU6HHNGwk1AKvqH6FNyMLdYXMY9/I5K/Fz/QR1a72cWXKsl+brRwZWqvvlulesMz7O2tn7pTdnmYBoYai5wgooUmmjWO6rASbTpyhqLPd+meGRuJwFIVqkbOh8aRGpgY2hh1I3Vw5umfqt077c2h425V41xYMQYXpzoJzBZNlYk9+PMy7Y+QgtsFfi6lXcuEqj/TRzsTImdC4B+9kBAmQiLmm5nTzjolRUG0obl8tdYax4+WPVpJoXEhQqiD3+BbmEAuFSHjQaz8yA== 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=eRzET27EyzLpRYXD+Z75iKhV7y4w+U4MEpS4i01mXOs=; b=j6+MiGtm2N7el7iIMFhOyN03wrp9s46DSUewyTjP8DkpWUtKhMlkozltYl48cySDqYksD8iuZvqv5vHMQrk27LW8m6cTiwqQGmGPEm+a97MRMoulwPq4QMIn39+nPKKtdGPzTOiPFfjCZN7f95fBvCwYwwyAGba02S6W4THV3lgAtOMOqHqfg8QWiqjtGexjkDqQawQDiLb1NJ0qPB3bcNnE2Q0IUi/beq0c9pVOmg2F/qNeyK1nJ9RwEdc9W0a0FPH8X2DC8PnbzCrgt10z6jUARePQsfBCe6pYjX29HHQzaV6o0vvS4wz4o4A+HVovjEFNQ6loRqKICq9ioqrRXQ== 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=eRzET27EyzLpRYXD+Z75iKhV7y4w+U4MEpS4i01mXOs=; b=LrDtPVSIYd3GLtiOfoL/j8Y97TIm/tXiwqLlbDXtztyksliBt7Jj/MUMpUuHO17UfnBSuSGa0QS6xwpjptBzcOxUwDrCd2uhdy7ETPd8bNEphy2UXguC5JM2d4BvAvlM5P7YgpF4sRVRx9KonsY3Tv3NrG+6MdcbhawzqfpC0STCXAx/IMWhqgroAX1sN0j90VH+TRCa/Qgf3WyH6h+yLcIkRVZUjsWcryPwoRlZf9Y/pU6PGRtagBuBFwk328S6kEzn3RLg44fvAcmYFK3TaCbVN8CxhN5W45iprMh6uv7sGsCdSjwR717gox/1zibHGUl537cRtBsp7GhC6AnFGQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0501.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Wed, 28 Feb 2024 09:08:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Wed, 28 Feb 2024 09:08:54 +0000 Message-ID: Date: Wed, 28 Feb 2024 10:10:54 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [fbMGpzB51sLQWvthtH3HLH/aboT1MowWhZnQKIy+Qbs=] X-ClientProxiedBy: FR0P281CA0115.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0501:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e2e6c73-b6af-42f6-0f10-08dc383ce390 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpZN37i9hALhMNTBFydZJasW1wrt7DBV/VBegTzqB170xUa5irFMXoq93A5MZvnibSSSf9MuT8m8tDAluLxptWvkQmkekipn8vrLNgwtbO4q960rmeALP4dMdtafsOQ14UwyWdhu0sCV8RADiTKUOVr/F0geRHUk6e86xM2C2lIbyLNOsmnCbEuECAwzWE4w1M8wRdDoQlyDulLkpD9MDI88FG57cQNyrCgKYi08j44p2VQ+KYycyjRCKAizsdgoh8WgyKlhdgqESXVrBjWFhzDxjXXgld5MP6seJApJLQJxwX4GDCzfnNZafgi3GnrlOEZyAM/b4y/RgZBL1rgZ5jS778sGCA73+YKmfHjsHzIY/iaov0vf/gv3WdfsdAkB3Otqn0ogdbEJz0DeN3jZblbgbV4dxKDluIrIeXr9i4CmHqBfn+XT6KBSKUiydSYYhUV3imYGee9wi99mQgGgtwB8teUhOXp99X8alyNnFGjN2HEc44vpARBI1brhADOto8cf6nPH6si7htajoY7DfpU+x3IzK5+tJPZlcK+2v/epJIUJ14usnRaJzAQrTA1J/CDqOemAsXHEpWRAPjuWebqEPNxbYYqmxg/VzGVit6rzWYwIOesxoln/5PICVR7H8XxWCRO8+PdFoRONsTelv+35rszi7T4v9/j0qLigUKx2fmrBHiljiJPNzocCiYT0FHykOjmc9y6gN6faBzg/aWnsYGK3lXRwbx0Sydo4Zrkil5PBUyIBHAqxJq34vzpL9k= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9ww3yn8pBa/6I/WDIkkVPIAmJib5+b3BFMwOd8Bo3FjYZ6WpO6Br9RKuy2wfYiVmEoAsGryprZPm/9nk0HaWj8tbZlZjeZd0g4U5qli+gRVXHS/9S31JvxkmCv2AX8eiYKyts09Ma1WUfQRy0PRIdiwfxRi8+eC6sKrduON8Qtea5lbU/t/0nx0ldLNR+kPNdmEALu51yU6nXYZeANzozXGqcw9P2OVTsh5oxNbqWHBQoViv914Xivl/WMzLzDnuPr9EDy8Y56iF3EAiSTrEMsOQWdjKfEyk+AXg7OAFSFU24/ze+FhDQe7FSTHSRJc6iC7/KbaGh1k7AwYwpFOVqhw9d0qHNaIJ7lE8B/Le1axF4UU8V+831tRVXR33iF55MdazzIeZnMbHkn2JPIRRrYISJlU2eKbFSuGoxcJNRUyTKEMBHEKCXOw2IsgXiTATK0r9FbwT4YLHV7fNwSp4fkVd+oa2haBJ6LMNn/03CKoNxgW/OKs7qwFQ9B/9DXLETlijGjcMidwRLDbTm2OGI7yayGGvMyO91wm++vqcxuN2Xl3Z+QEnN7QIjnpOO3RJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dmdXOVIwU3N2aFBxTTlwUnFrbFpUMkJ0Qmdub0R2Ny9hdUxJWk9HTnNUSktn?= =?utf-8?B?N0lPR3hjNTkzTHVCUzRKMHJzNm9zWUtCbFdpNnRNSVM2U1A4K0RzUVNaaS83?= =?utf-8?B?M2RFMk1sVHRCSEgyQSszZEJIbXNuNkRLSys5NFMrL1gxUGFyMlZXUGc3aFox?= =?utf-8?B?YXRaajhTNExVWHE1Z3duVmZUeXJXTHV1SVJPYXI2ZWRBNGxidjJ5cG84cHly?= =?utf-8?B?U2RRVDBVdC9tN0duazgvT1huWk5BVnEyTFR4cUVnVEVHR3Buc040VmRGc1hl?= =?utf-8?B?RnNNUFpKa1gxR3Q3aG1TNHBsbVg4NVEvZXAzUFp4OWxwbitHOFcwVkJ5SURy?= =?utf-8?B?Q3BteE42TFRmZVpkbWlMQzJrbS93V09PYS9HcVpnYTYwV1lSQ0U1RTVxdWZz?= =?utf-8?B?NGJzcTlNQ1dNSk1vcThudWtZMXpwVE1yS0g5TE5hZ0FKQlNJMHo3SGtHUzNp?= =?utf-8?B?Z1BxYlZFOUUzWVlFMm1VSXpBaG5HbWZPa2NwRlRVRmd2YW1yUU5qTnVsZzAw?= =?utf-8?B?SFJoNmtmWE9kRmtDOG9Pb1hlTTluMGJ4Nk0zMkMyRVI2TEQ1aVpjc05aZDVD?= =?utf-8?B?RmEwVDlYNm5nQklKbi9MbEs4ZDZUZ1VXd1VEak4vSGVkbko0ZitNUGhRVEV6?= =?utf-8?B?Qk9aaHBRd09HNVlNd2djR0FlMEI4N2ZNTFI1QXJINkFRZHdqVk5ka1g3Mitu?= =?utf-8?B?cXA5RmQ1Yy9BVzVWU0g4K1A0ZDhuVysyYUJHMWc5bWF6UTc1blc2UkJoWVpt?= =?utf-8?B?elJSR2RhMlk5UkNpOFU4N0VXUnhMeGZiM0dXZkduM1M5SHdiU3VEMFA4dmta?= =?utf-8?B?TUVZNEd5TUdGaUhwMEh2VXFRMEpSQjQ2cG41RG56cmhRNXdZVDQxaUwvTlAr?= =?utf-8?B?RVBCT3NzSW1IVjBUREZXSUZReVREa1R4TnFDeWs5ZEN2RHJ3OWpNV1Y0MElh?= =?utf-8?B?U2ZRWGNoOUlVV1VTMjhOQ3JhWUJpcnRIMTIvWjFWRGJiM01peUpwUHNTVXBP?= =?utf-8?B?YnkyYlBESitHVmJIeUFrM0dWK29EbmFjL2pZb2tVZTN1YkRzNE80NGZ1SzVl?= =?utf-8?B?ZGc1NFcvNzgrSk5oelZWeGhoT1RDYWdtek1QVmNqMjI0N3QzLzg4elI4bUwr?= =?utf-8?B?eXNIUHlGMW5pWXQvQUdkZmtoMjFpSUJUOVdVaG1PbGtNWUhJbk9VaURjdVRE?= =?utf-8?B?RlZXVCtKbGVOVzB5eElpWHpqbFZ0U1NwVmNKUVVmSmFGM0pVb0cvYnJpRzBj?= =?utf-8?B?VmdCeklRekN3eVRhdkRiRVVTc2tGVkk2ZUYxcEMxVVdnN25aaUoxT2pyNXN4?= =?utf-8?B?SGszbXVuZ1AxaEJxY2MxQVh1Wm13dmxramdLSEcwS1V2K1VVbENxaExvTTRr?= =?utf-8?B?eEZ5WnZMeFREZmQ0QUJXbU1Kai9CelNiSU5leHpCYjdlRTF5UU5TNmk4TG9q?= =?utf-8?B?Wm9PZkY0UnNveXBMYVRtaW5oT3VyWTRaT3VVOXZtSWE4Wkt4TzVDS2JCa0Yw?= =?utf-8?B?TmF2RDYvMnk5OGkyTE9vNTFUeENweFdpb3Y1UHlkVW94MU1YTGVDYWdPUmQ4?= =?utf-8?B?NGRRRjdoTk1tRkMxVHVhREF4MEdpcFBDbG1UUG1LR0ZwcDZTLzF3WDV4REVL?= =?utf-8?B?Uzl2SnhSUVVKS2JpNngyc3RHSm9lODlwdUtITkoxNVF2bjhiNDRpM1JYT0M4?= =?utf-8?B?YnZhSlBFQ1N3VEVoK25jLzN6c252V3NOYXo3ZGF3Tnl5Sk43dUQ3a3ZRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e2e6c73-b6af-42f6-0f10-08dc383ce390 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 09:08:54.8832 (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: AS1P250MB0501 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/intrax8: Fix assert 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: > Commit 900ce6f8c3526f27173057bb955f54f4f4f41246 replaced > IntraX8Context.ac_vlc by IntraX8Context.ac_vlc_table, > but forgot to update an av_assert2()*. > cf7ed01938a4d8b2ccd28f1fadacd79103e54eed then > replaced this with a check for j_ac_vlc[mode], > but this makes no sense as j_ac_vlc is of type > const VLCElem [2][2][8][]. > > Worse yet, mode can be up to three and then > j_ac_vlc[mode] is undefined behaviour. This happened > during the wmv8-x8intra FATE test. > > *: Since 84f16bb5e68dc47eca4dc96b3391c58471cd7328 > config.h was no longer auto-included in avassert.h > and this disabled av_assert1() and av_assert2() > in files where config.h has not been included before > the inclusion of avassert.h. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/intrax8.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c > index b6aacb170a..948391599f 100644 > --- a/libavcodec/intrax8.c > +++ b/libavcodec/intrax8.c > @@ -103,7 +103,7 @@ static inline void x8_select_ac_table(IntraX8Context *const w, int mode) > table_index = get_bits(w->gb, 3); > // 2 modes use same tables > w->j_ac_vlc_table[mode] = j_ac_vlc[w->quant < 13][mode >> 1][table_index]; > - av_assert2(j_ac_vlc[mode]); > + av_assert2(w->j_ac_vlc_table[mode]); > } > > static inline int x8_get_orient_vlc(IntraX8Context *w) Will apply this patch 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".