From patchwork Fri May 24 22:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018744vqf; Fri, 24 May 2024 15:05:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKXj6mzINUYSQgQs/j6w9cPhg9syH2PoIYuFYPJ2/bU+C+7tR1cPpnH63OGAr2bsFgcONno2C50GBB8Dk7tZ1WR/w+PK6RA1e64g== X-Google-Smtp-Source: AGHT+IGGWIl7gFu953pGlnS8RwiJVsQpb9vDIvtPG6DWD9UR9Frv/ilN9RqdhvFBocCEI/XufLH0 X-Received: by 2002:a05:6512:3c6:b0:523:8723:32de with SMTP id 2adb3069b0e04-52966f8f472mr2905066e87.53.1716588351877; Fri, 24 May 2024 15:05:51 -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 a640c23a62f3a-a626cdd15e9si117541866b.929.2024.05.24.15.05.51; Fri, 24 May 2024 15:05:51 -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=NXQX5bYq; 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 660A668D5D2; Sat, 25 May 2024 01:05:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A013168D4F6 for ; Sat, 25 May 2024 01:05:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1xyH5IWOacRVjF/k/xQjBsZRiXZX/SYGKk78JSDgT+qH2IbGVhnqU7u5x9KxZ3sZsIqfDfrrFZWcRNOJ0oDqpM2oUFGvdvcnIp112GDH0pNhYgCH0RUt9WkPmZ4q2W7A4tyPuyCs5q8RgAStQ3+obTSTT9krgHIVGybtkvJN8RZFHh7oJ5qbi0FwQr4q+4DQLQ7Zbxf7rNkOY5mYFdbhAnV6HS1JKabO5zJ4Y8wGYWDmtppUpuhn0ZAX4B3um85HHfV7fyRdCB0ksxQazjHKU5qr0RAHYcCMy9m7hewmrFTG8geKIwKxtnjOpSK/eoeZURy0Xg3wpB6qG3hTRehOg== 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=CnlXLYfH/ImZdv9ZR8Tn0Gx8u/9zDFYMRyjiE1cVuzY=; b=XVlXfDk+yme1umulWHJi3D6jO6LuthlkSgOJfiuEWYSSaKAB39tLEbjack2Vd0n9xevw9GYCTiHTcEnrsa97XvIw32tt3xRewbexxclOBRBf9X1L0VeRVgTK4OU3EEec7TomdSfHnXX85duBawUASWN/IUUs91sZjxrwIZtNc24r5foFkuNxSzDWbo71Tfiwq0Be++8fBIKTpm9ospB10L8KaVos+P0GNQhs+66AUL9BUAP5cXiu69djvglIA7KL+27OEjLOqgECDjddXZfU+eU6EhVg3WYRULnJUwsJgH64fJufJD9BuEzmNTCo82w8z3ZhtOyrPwdiwP9MfPu4SQ== 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=CnlXLYfH/ImZdv9ZR8Tn0Gx8u/9zDFYMRyjiE1cVuzY=; b=NXQX5bYq4b7V/P1MjHaMGTPih79fgJecWk6Iqu/ts6murw5IulAfPjnohBrHq/SXjUk59aDKYMpjCqu9FLvM1jy8usT3HeI7zXNvRb/b2h2bbkPbTAqOQklvnKrY69i5TPSNSYGBLRJFqrHtrXbA7kWHGCZh3at8mhHrSk+xsbux3GJec3rUlG7sijfmz7JmntOJ+FXc537KEPDLN/bV25wrWWZ/T2DxQhdPVeYEFSijkWQE4hdlcBvqCIf4urZQajommbSyDKDTunUdCgKrtQGD9jBPO7zhhfRvQ3Py5656e1XJTj/Rr10St1cuJQm5SqN8/li6K0PovmLyn7gYNg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xpgjatxWjP0TdHQ5CGZGhOuXXFVIrn/2QFHfXeK0+bc=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 50430f12-138d-495e-3b07-08dc7c3d9707 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: RKyDVPms9Bkj91DYtNDSn2TXZV3xaQgYTK8ekODomvD8boQT3+3pvMiHFcJAy5T6wtTUqI0o7y6TZ/rfkkzHVKKaOxKCZi69ezksm3XY6eYkWogvyM/BD7mxnUZcMS2Dt2cSoD+vs8qrEoaXwDdDwszqrVYLCGrPWrm9GNeHjXH45QXiZyLm0PmY+ul3lUEKI7mzR3/t5hLclqVg2vp7bOMH0PPwZ3fYNn6b3zDfjLs9k6alr+JeRcPm0LQ5brPZUc9Gyo6lMcXdFsTUYlbxCv3Owuf8tvCZNQYNnxsNFRNKdkVpwunFRYjf0N8ZWpGpKEN3jhKgahqkzukt0XbdpPljJlZHw7uFhbIburvvZ69zrDBaFYg9JgNTtzQOCdMkSFiGpjCMwapECsGKGbjfQtvHgb8Hq3Tuqb64/75CFq5izNwUQ28TJR6jrleZS2X9XK5baCwnJGA3/tpc/rP1KvDHB21O7wsFh787597op0ihY36CMs0pVMitER14yUtAxcj3AP6UKn/3GuEhXHz7kGJ0yennjWKUXv1+uD7EoRUcPTm3n6wJ5qaVi2djSWETCe28kj+UQOeeFAvGQRyHN+I0hGz3lnQ5iQD6twTufG736D70hwxYgUtft4idT3Ya X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NlN35eVODJLBRX+wzeigVETJMkUAWvO9/m+yIvv4bKylaK0Rc17MS71DR9DUP45dGnJT0GItP6dKgClyxsofbzV9hWGhVwvSxnSyRRYu0MwE57eEfc8YH6px+m1rIdCBF5DjpP79ZcID3bzlNTV1F4EBV6nrq04icLwGY5p/U/dPkwLoztROnkYwOBd1c+fn6De2MmhCXKfJx9jxjGua8KzT6OVnuwnq6EwWl3DP2vDdoR9l1EN48BzKTYwipjTybrmmtcKoNNewisOiGWZArskzdfOtDGKVPYQReAR+MsrJ5NiPO+0NLYZsRMH1dfBgtxzTWNCX5gR24omCEsOhaY3C3lfMXVxYaeMXySgu6+nt7MFWQfnWkTwwdYraRs1uBYvNl694AQYvYwLjBCVamLusAYwlYdjL/dDthI72ZMFC6yTbzPRy/SyiAsleltxRqb4XQjRmD9y/0YI4mFQVaJPeT4a8LHF/OPQuH7co0PFSUKRzhTWDCVLCpZ6xxeGg0YDEAoA1KDtt3C4gjdQE9HeMSdHvM3wWg4N+RwHudx0Ejeyv+/eJ9EsJpBhlf8aezaCdd+DIJV2hjTVTpnAOS3OjxcOBghy3OQ9AFIrODgtN6ce9nOpjk+THcDRjCDzKzSdPg6+0WlEFNqkVApYSLooWaWpjMpm7PIbzGTr7EPB/m3IuS8B2MUjj9b1cdO7pzrMEh8yGuQ5veb70s4B1+EAt1Fy//hICWOS1ftn5yiJzaKAEyDw8/MDnsGtSzoGYNzCLvCijEgSFbFqzKWVNVPgGgE+/BHjl1eqM+lvNj8rNm/dYGjccaC2uF1QAssMYlOQ3ZH1rfo1qBnPjTbVwKdlg7Akz1lnYZ78vbbE6eAPdRhi1z16UjlXJLTLrmAfmoVEW4ofSb0p5sc+2s34Qlx+necnojXAmHCgao5LefqMqLJqucHTR1op8Ykm+tFLOWVOQlVTilI127orDs8m9MWN5L3q6O9BoJl3x08DuNss4Efv9Me4OQpgl0l7/mLYzBNCVNvh7DZb3yLV6Ab4ng8Ivy+Yxce7cFElY6inzjL0JBM8506FCq90wJJU6lbe7KhsMeTu4EZ4u/3/QC5kD2RUrw6qhHZfIiGbg5SmdDctwTGDF01XVWVaet3Asag80uaMeNYjrppzpSFd+e286kTd5Hk/xvuq6BzfosRosrksPm1X5s2Nk4Fuz/fb1nCJJj9OAQtPcRcL/a601hod8iyIjTAw+xI41Bi/rrxJpip0KBfWWyWCYh6ODCBZAbKy1E9rMzNAgHX6CQg27RYLpAw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50430f12-138d-495e-3b07-08dc7c3d9707 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:15.2551 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 05/12] avcodec/mpeg4videodec: Mark impossible switch case as unreachable 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: OHe84xjHkc0P Alternative to 8fc649b931a3cbc3a2dd9b50b75a9261a2fb4b49. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index df1e22207d..724ca202f5 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -24,6 +24,7 @@ #include "config_components.h" +#include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/thread.h" @@ -598,7 +599,10 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g ctx->sprite_shift[1] = alpha + beta + rho - min_ab + 2; break; default: - av_assert0(0); + /* num_sprite_warping_points outside of 0..3 results in an error + * in which num_sprite_warping_points is reset to zero. */ + av_unreachable; + break; } /* try to simplify the situation */ if (sprite_delta[0][0] == a << ctx->sprite_shift[0] &&