From patchwork Wed Dec 8 20:17:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32204 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp973284qvn; Wed, 8 Dec 2021 12:18:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlv6XgsYDi6N0PLQZvZTgXJgxbODp4kLEEF6KMV06UlFRQ/lmJihgD/s8ofyB17LBsVFOM X-Received: by 2002:a05:6402:4396:: with SMTP id o22mr22394673edc.263.1638994681494; Wed, 08 Dec 2021 12:18:01 -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 g3si7923208ejt.101.2021.12.08.12.18.00; Wed, 08 Dec 2021 12:18:01 -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=NYYXpGKr; 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 EE5E868A842; Wed, 8 Dec 2021 22:17:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072059.outbound.protection.outlook.com [40.92.72.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7341F689D0A for ; Wed, 8 Dec 2021 22:17:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYwbiKIhD/VP01GsJlCzEqwlgfGqyLsjw7GKfOA/zYHYlAKwArulm9xy0ej+zgOPWJupnPzZFqZXFAlndUJ09go2KkHPqRUpzcmZklNAHUn00d2tb5M74fWfhMdVCPADDJRFvh2G8osgBeCgL3ZQFs0Bb+PeWVO65OOaxKbxGRyk2jrdQIze/l+GO+nzj32Y9odXmk0GTHehzU4zOqTVJEceMV+GUlH56BDOvsX6fSifzv+olWqsncTidh3sd/hYf5XiR77V+ZB9kCjZhSjufceNOlp2mj0Mx0C+8qwxvjwbsYmUDAVsx8YtBJ1BrKWzsRZnQvULcJ5AGgfsTJ5kkw== 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=DYmgVvB+W4jnc0Gi8JRtT7yXJDeW6dXaPwUjhu77vFI=; b=LOzArEQ4Y2MdR8ZCJklwllaILbvzqPsuv28CIncFCUOsWTMDj559M+L6f5ruzIXuLNZc/xJdpsxoadHEl+59j1Uf+fbG3NrZYY3CrjA2YJBaT4i2lhrMNRHIJBxUGTBBpYoDWmfyq7J8vwngSd6Rm9Z6FnxshJp6XQOL8uoOo63NGvQ4+GLnAFZK97Kg5TlWK5ExpvMNIVUUTkrHJXRcxpOFzeCC38lVMVonMH8bsAKYvyBoLZ98NSlHxqw4gUZVXh8WdizV9gj2Osm0KPSDS3miMNtUts3CrFGd4T+5csDzgeubF4DodXDHlHU1lvGZvqf2o8OuMvrZSAxN6wBa4Q== 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=DYmgVvB+W4jnc0Gi8JRtT7yXJDeW6dXaPwUjhu77vFI=; b=NYYXpGKrnAc3ZobvADuKbNj/X7Lsl3CAH//KE9OcYfy8CeVJArXfa+r54wrAIdqIxyQJ5omhdaFNG0p+iG9n4d9dXT7uE2V86yP2oL5tmv0pFQeJaQzrTwsKiOQCLEoH5GAexSRgeAVrPycmoxSNAh58EYp8LaaMt8sGewBA+CJzJxSVBhZdSGMe45mwULCbYTRCbFwncRLT8nRF2q5YtghyHAdWpZBsmka/5dGXICQ1jUSvOYaad5E29x9D23/S++1cBcqRzWQ9pwxFjy4K4cp1qLjruv9uHqXppbFBn9RFgBtr8Jz5t5aZg9pvSiDqe9rQrEuV42xCkluRFoM9+Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3319.eurprd03.prod.outlook.com (2603:10a6:209:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Wed, 8 Dec 2021 20:17:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:17:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:17:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [LP2BBNNCj98KKM0n4NyVSuZUS++y8tZ8] X-ClientProxiedBy: AS9PR0301CA0043.eurprd03.prod.outlook.com (2603:10a6:20b:469::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208201743.593292-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AS9PR0301CA0043.eurprd03.prod.outlook.com (2603:10a6:20b:469::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21 via Frontend Transport; Wed, 8 Dec 2021 20:17:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffa3685e-0fb7-4e6c-a3d5-08d9ba87ceb8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUJNPNrsFw39+IRsSLFO7mftKCt5ZIYOeuatLqoQCeFzx+yDzqC7Rphpuv2Ivpot1dUQuIQH1NqXI8mOTuDNDYzuBj+zwhlY3f7mBLyF6OZ1u1qsJaJriMG9w4U5QYF7t2TRtyH6hJRSVoEsFAI8BA+nGKTq8FG5OApM/q1CmpnMQQ8QI3RcPH4aufge768o4BA+JoIq4qLNctNsh5a+AO8yDRmhs7TysRG5mJkkJ1bXvoCGBtAGKxBDn87LRqMeg+g8jHc/txKuyibmJGgkeIDL5Qf2Il8LZ5FcBwnRkMXHglAhQ52b8A0UomDwYlMe31Orl8tSIy3kKt4oUGihdEAvCjzs3zFmqJhkMCYc+YNBycvYuCLKFJoaS9PRw2k/LWn+368m/3wVT01j5E/+ni7hccCw3wbE2XTH0Z+X/QD+bxGjEsPA/zxBdb35MwfnHrRTBBG3cGUGovgeSdHcqKw10QzlQBLhqIlEJn3U/XDl6iSOQGRmtL3otCE+lVX3Y9xVtppDRXgAodeQdelLnmj5U3oj9Z6i0smrcMA8DjjlUmW5JSA/PYSbzKsqoARiEIKm03u16gK0O3In+DDUtv5Y+oCKqHrmNKlDTesofCEwqnyB8wwxm2CIzmeVMAs1SDZa43C4pQdngInysU1hOqU+41nQSwhL2eOCouxABtxpyDqrFtKq6WIu1F3ZkApOmjkh2N98KoQkBNzUidipS73y3lpjGXRSTg= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3319:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g+ozSUhzhnnlCTPicCJmGk/vXpnA0FV+nJ2mO4zH3lMyrBTUQPHXkHRFa3+9elqdikC+pgh4xbwncxvD8XU2BW3tWjHFhANM8BpvKrVbvm81RlaHz8bGzeSLUCi3Wc8odV0MhfrFzw73Ayun754YEkWE5gWVMM0vTBKhBbRAN8Do75yfMGANpHZTjAW4PfzaSugu4rUagW1pSft6g3WAtHNZ30XDY6LYqkW0kSs4/NkUQ32rmWoxZpWmOIJGctHHkYvXP2Osz+/EXHfHgJKP05dGH/JFk6kOrTUjeleqvSeETLEvMtxdexrbhyHfMX3v9YsWyB6DyMsbdf/H5EuyiC1uPpwaj31McrgJ23HifcNpM4rTDaQb9wH/GBOnk5lShlxsYZBsDYQunkOUHe4nbr1QFjcV/ThYcLDh12uWbnid5apeTz2iwjpvWRLGhXGk4iwDtN5X2s4f8i9Voy1nE+ipiChrLqRoTBJjcB7dY7I7Wq7ISpFZ5kcf5cnJSvckHf2sklbPmoT357ts5L2lY4uJof3wB92Zo5cD3o4iJUYiM8FW02mJ8QCRYrw14xIoxWpYJwTqhAnAVA0vGGwqhw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VjjMZmwusHOAP6+zhqLuGI0pfmAO14g17fZkmKPEISqFJkJq/hN09/a/vP4jTetk/xeI81PU2gQODRr6NkEDIAPCjWtXg7I2RmO6T8mrvELFwAq36M2lGWlW9Y5WzcL2BBIkKykU2trsXzMpdxgErFvzyXA6/6O3Wm1piq3fpUCg0mwFNRFt+Uqdi004Wf6qSAP7YAf4Mct4i7hpu8HqNMBrLj5kYbZMD1nlr4x8gQLPJk9dHBa8XwkTILw5PJCqcetnyvb/UJrz66VB2W0JUG6WTDJC/GbdotirSk/wacJ9z9RkSJ9gKlH6FaIfEjXZsxFFgt2XWLD1eggqfvGceOsSwCpWKij+ZbDalmnhoUm85F/bC6bXMTcKJWqdnyhOEML0KcNfAhPf6unn3i0bnUKSBNAuZEKNck8/N5XuO1oDiELf0und7QOpDyBSzqOiTGT6VZUelZ4iGkcUN5KeQB29CUgHody3LU+ZuWl9BcE9TweCMZQ+5NxZy9trq3T34C0/mAMSlmnFoyBOouAuAwIv8eyjMoB8BdV2IxvnNXxQrEycYfiUbB8J/+ZlG+DLlovWahvLyk1oNI5w5DH+nvKTZX6UvK+wVZIefIoAZZJ7oi+6hHnvO1LpGPVcRmkCkP88X7lxhMm3SEMj9N7NDVmOOCSREsXLfapUTeJ9DfKVzVvwcFSgbm3CUA/8vpIyb1ZJs1YpgvR2ZzU9YD6U/oKOlxdHnC76lyDmGCBLU95iAF4euAjX2OsgwQT5wzQcVELKldKSqnbVZKlkIaou2hNmsU8EXZOEc/3zSBpFf/HALUyZtujta7nXD+Dfme4gl5vaTzD1NqnHBmQ8Zg+iwktHaSzoBf8KILdq8rEgU4VZ3No9mkfUzvxO3jusFcD0Vd/Bx7YHDK92pLaMojbAUxnApqStusg30/XCqchBAIcL2GwUsba1C50XdOKGhS1yD6Hn0nOJjNGMStUraq6aQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffa3685e-0fb7-4e6c-a3d5-08d9ba87ceb8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:17:50.7000 (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: AM6PR0302MB3319 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/movtextdec: Switch to smaller type 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: nIoulwbfF8zf Content-Length: 1035 The base size of a box refers to the size the box has in a file, not in memory; so size_t is not their natural type. Therefore use a plain unsigned which is smaller on 64bit systems and still big enough to represent any conceivable base size. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index b0c54bf1d0..8dd571d64c 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -111,7 +111,7 @@ typedef struct { typedef struct { uint32_t type; - size_t base_size; + unsigned base_size; int (*decode)(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt); } Box;