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 6451C46CB4 for ; Tue, 8 Aug 2023 16:41:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B7BD68C81F; Tue, 8 Aug 2023 19:40:01 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F19D968C802 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbXSw7MHLbSp5VgMgYR8kAfDWmaAeFADD2fCVuwFKHbJXPwg+2dwzRki5eYmFqIxHEHqEzyP2/Jit7QMuN5cn3s+qc4zDqSdpx9Oy0MiMI+YOXn6876bkBqsTMVqsuzcfW56pqNu83oK0U348twh80zByJcwEfDMPfAe/xE6XFXjvS9Nr51P0eI3626rOOfW5WtWUZO8zSYigKV79SYOH0cVmISvrtdvNpwsjmY76DtEUjfA3tuajyzoeF7ESRvswSAO5YO1PxV/K+I4BaX6yXuEiLfm2UtLT9TADmEewBP0ZT+IocHaVRWf19wwP7luOGYCSrz4/YFXf/2d7r/x4Q== 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=yhgTftEw5mKRrniLoA80fXp4AEQ903mxryMU7SweBak=; b=Q9XpS6sxGShvFj/jRNn2SeILWaT/At9zLafinopoyCgdu3BjrXCUj7Xqv+D/klmPXoDE7BZlnrN8dYfDgR31s+bbIhXtZKfKsY9ICvGUpwc5eFtoDZ3TZzcTVsPXxp7aSQNNYnFoa9ZzvaisycnjcgTPdmyvcVBiCoa1oxKSOA6Byu1AdPZ7mNeSJFRTUl51GLN2KcKdPth0W6bhW1t+z4KZQXARLz8LmbNWsi7kni2Xmuxot6iBtYUcJMpcpUsiDss5aCFgC2KvwtjTFb32+2T9Cn2QNE4kSR332l2wHWJKm1znpEaJ9arq6YRfXHOeG2hTKOp95xAVfgNQwE/hDw== 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=yhgTftEw5mKRrniLoA80fXp4AEQ903mxryMU7SweBak=; b=ZO4JNL0ZX/ANaPQJQSuD1pwuFi9Kp9hkPtdrgcx2kF8mMWm35/Wi8xIzpQZhAHYRW0kuTrZZzOQAGrwVbzxVi+F5DSXRsVTxlK61QwfrZwOdIIeMf7TsAl6gelUWTdgYtwmuLSwoCdUVxs9uAL89GvmX5N5gqkNt+zMSoSz8dBqBEE48FrwX7b8b4RLXY0dk4vZeQo7PNpgM43e0YI4P2Mka/2RmgRZN9DzfT/69O+sjC640kWGUuIJ6hbxvuBzKmqj9jmQl8EH8O/Rz89vhgO1wLuCDYlZAjuLVz1EjX1Tghkab8v/7BT87eFsGlvWOVdwLJOX272LXpupozNfq8w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [pDoFJYRCHB40ix+pi8avsOlhWJwMMCJ1/XNAdWtutGc=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: dcb9385f-410c-4500-d79c-08db982e14f9 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2RSvU+rRLrL7hgb+tTI8NC9vSU2Ojb6YTsoCj1yaHs5tN9FLxzj2eInkeWKpQqwL/y1oqK3nhaeBMswBSCM8G6lwXipzuuyvkXCS5sLcIl9AT5OoaGLxBYrzyOYTrETo/UpDSutvAH+nOinjIkIzDXCNeCx6B+9MEyKTZAP4xUNpMhhl77mogn7g8B6epAR8HAYvM9sW4xFZKs2hKl296Lop3D0P3Ay+oJBP4+B+Tffd5t5rPe0xPOsxQk0CkRhytqAyJsesElqEgo81LrOAjL/xCo0NDqmzkKpFdd2BYaGBucaHDuq6XDytI0Q1wpvvcvSeHgunfhG9d/AEFx+Bao/BUYPxUFD8kGwOSk8THInDvpF8K8gxxGTuSXVaFGSukkpyUOQW+e81AMFJBJrZzoIXJMOY/DOwE3+2QgU0XnWAUr+I0bU4YQwzP/jRPTKr5aJf8EiaYLtBfVwgrsTaFICz1vQ0X0Qt2ETRU3QS41jjaPUpAAy4HHBJn3KYLt9XJdlOORCNySacaImfFo6Y8c+Rag0v3VEoWaD4ADSoX9+txD7fngW2DE/UoK7awOosENeJalFzrkve2Ct7R8nhbuafmRO0uL+YXnVLLUQ2EkKXU14HXngi78rGPXIXRXtdcIAHM9NQUgiN24s5iTDQ70R5uxLJwBpavvkLZuaQ2AzQAyn/aHtioR5weocgphulZkCSQJVcvT8kXsrhgd95NMt2XQkcAKXMnFjp8QKrjev0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SzEJplDwsLFuL/ofA/d20N/XIElgkcuxxmCwTuRRPZnRh4FmVpgf3wVzU3sFrLuHXkFYCJo/VB7ki/QD5GjmQdYW8VamwHITKJ9kYmHoY3HGeUwJX5aXUjFcKv2I9q3xaoEyf9/mCdvOLSeqkeM6WnFLc4rymlkE96PhkxxMoS/kITdr+ky14ZWphrSjs/jZCuPC4FKTKX8eDSyHpEVAbQba56hqxXDoNQO9s7RgENRO5aRKjMel3Oii7WTY6vU26MaF50NtMGaOZhRFrAebikEIhUnA6uhMfBS/Vhq3Xnagnq6bBqK7EXBCAl57yQ2cst9CJ7gCPTGakNYMXLc0F3vxM/tbc/Z+fdKvNxo320PvCFDt0AYfmqwWQCaaxkVuNXbtAyrYTKVSx1WLv1189k/HiTDFhl545mwdOUcZ5pQK0hji7dzpKqaiDEIcKnJdHASEF/9frOuXF/IUArXenmvkT7qG4fMtfEkSqPmQcTHKRw9LXLzYmZxxG6DE2NsEjdiXJlUiZtg5UMXkJjwZVmMEzrS11TBSEu78cPIlJ/MWbFdft0cqf0oqvAAzBa+CyQuYN54okFYls+RyYOWWkknaSOYMytl7LgAWgsNqz45+2SjViBU60GimU9zhCaeG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4ekCJp8IsrxIp2eNMmmzHbXBX4sNAk7KDvmH0HjiAYAr02xiIcXp0JPrOUKg?= =?us-ascii?Q?ohygfnRTN+tfxfuvEkHc6F4ZU76xdS8mC3TqvUMalID3OV63zioCTEN7ZyB8?= =?us-ascii?Q?IYX7GQ1m905o+KMQew+030w7mYZYZ1SXJATA8roYKE170wqXKWq8qfOYjg3i?= =?us-ascii?Q?Lw4xd8Qy42BjQFn0UqxIarv1wibmkQRiWX9MTYDPibSyoNt1oSs0HqIwfJ51?= =?us-ascii?Q?AYBASfWA5p2WGCD1bMHWBTgPZ+na1jCT2100WlWBHVk/RkptvDlDGCEdZ7PP?= =?us-ascii?Q?jFpjk5qw1EfX59sskMAvbmt5L4KIHBXISHNyEglIxFTjFPrMLAgkgKfHoQPX?= =?us-ascii?Q?ny/CX/1lLM0w9vwlRL638UhBibVEpJoBUmxJpAKW6Mz3wB4aMeH3JB6Vsr+f?= =?us-ascii?Q?SdHPXtjFc6T05sG4FdSkq1CuJWgFA1IXh5FqOI6y1A4yZoh21Axadb7942R2?= =?us-ascii?Q?8nCSQ1byw+i10cSDc53QqVCM8s2hsK/yRbztWIWp0OD9VhU0pat06knwS8Pg?= =?us-ascii?Q?Jq2CWpwdPcInFBtudGDjCZxzQVAqOOPUnSPqCm66qgTR+px4VuuI+YUTDrPc?= =?us-ascii?Q?p64wdm76V9njxKPO2hzv9NfLVFDerTN+DagUj961fd9TeAOowP25FGCXwkO/?= =?us-ascii?Q?8wKEhRfOUE1HnaY2OVaNhbz4X6SgJ+Cw/DxsLmYw2MbcOJxtJ248b2tTCjAr?= =?us-ascii?Q?RhHPBqSl67Yt0pZ655i108bIkYreA9aYj+RK5hBn3ayhv91P/3EeeOPznhhJ?= =?us-ascii?Q?g8XcwHxgSabTtRWM6j4jJb5JmMoV/lNzCqsQvVdQO/hDtMYc/HU0VCSDOgUg?= =?us-ascii?Q?fg11kc48zXutI+mwVeJywN6W82E+wD/PlJqKZ7bB/GEntXKMmnsavTFMDyb/?= =?us-ascii?Q?w2eqWLLpmDoCdC4x6dvRpWcVPKmbrjvTY3euGbZ7ghTi8tUvZKiL0mFHCUyR?= =?us-ascii?Q?MGnqcT4A/4INReWwnuYiBhFQ1/2Cq9Tij4+0chFttxoCousKLMv7lrloNEDy?= =?us-ascii?Q?V2Zaa2TnufaeJe095T+GOOxB7Xu59MCTIITlrn6xNU7cJBpktENlitvMMl2l?= =?us-ascii?Q?506mp8YEoEXGHyRZt960YX4JLRx2cJ6zhHRrTJmO3zL5octrDLYAi7gCv19n?= =?us-ascii?Q?ztDtagUyNhEWYUsdlPkLwEuuRiZXaOrS3MnC9JvKxLdCUqPHTcac+20QWWsw?= =?us-ascii?Q?HdhN4BzuHnZynGHcay3kITnqNZcMTDT7eppB9KzZduUykVpqbRUnIueyNjET?= =?us-ascii?Q?fhPeluyZQ8OioBmRjzlJ?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcb9385f-410c-4500-d79c-08db982e14f9 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:49.3242 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 12/15] avformat/matroskaenc: Add const where appropriate 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 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: Also move getting the DOVI side data immediately before its use. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 12a28a6b5c..abac70dd80 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1667,12 +1667,11 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, return 0; } -static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContext *mkv, - AVIOContext *pb, mkv_track *track, AVStream *st) +static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMuxContext *mkv, + AVIOContext *pb, mkv_track *track, const AVStream *st) { #if CONFIG_MATROSKA_MUXER - AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) - av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); + const AVDOVIDecoderConfigurationRecord *dovi; if (IS_SEEKABLE(s->pb, mkv)) { track->blockadditionmapping_offset = avio_tell(pb); @@ -1686,6 +1685,8 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContex + 4 /* BlockAddIDType */); } + dovi = (const AVDOVIDecoderConfigurationRecord *) + av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); if (dovi && dovi->dv_profile <= 10) { ebml_master mapping; uint8_t buf[ISOM_DVCC_DVVC_SIZE]; -- 2.34.1 _______________________________________________ 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".