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 7F3A3434C5 for ; Mon, 13 Jun 2022 23:24:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EC8568B609; Tue, 14 Jun 2022 02:24:40 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2030.outbound.protection.outlook.com [40.92.90.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AB9B68B5D4 for ; Tue, 14 Jun 2022 02:24:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bWUGwqH875SSL5TNQUgwzuStZv4zRySjF2MqI6oDdPThHfgPDFDmwVq8X9MwVhBo4Gva+lVY6lolsrI4KyU12trO8sNVG+NELBIiidQ+P5wrBo1vmQZhpDPk0X/oVOKPcVZKyo8c5YHQ8Dawa9J2kSykdj/RfVqTzQvD/9NhBqUaLvn3hz7ixTay/MOfEOSJ9802UrC5kUGUnV7b/W/Qw7AJg1/fwIEGM6XXBB3eZAB9WtkErEurjWQN1Qg2oaMs4ZGZItIJ4dQPNt9vM/66EeOEGMRpLZIAprMzvegfLSF2ECIC5JLX+kUcHYPHE8WYY2F4QVHYRPg1SLZ43naYeQ== 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=I+x5B6XYO87QFxX8gHaXx7HO9GmjFiKuHn2tY3hqx/Y=; b=nNEPj78Kp+vAPTe7rKUJicn4mH9nVCobWcS1da9gAkKD3+sGY88WCoHA52nAsgIoRqSbjfKMaVBSQEftg8ByhDz8bNfCgHsLXa1mE55DGyJnG6sE824segjtWWB43sOQLLVmcA6KEFF00BJdUXvqenbW+n+MLaR3TKEQ3wedpc3Dr5mEXCm41+UZjhTPoc4w//34xjbwFkumka1sI4ya2L0I5nehOtElayG21TnWX878M8gR6RuYtP1CgOpxJ+N7bD/nRlmEoEAjGyLMc/fq1/5G5VN1PCSWQfSt0tde3uxOTnxrFCH6h2KuNgL4vZaToZEe2HOVeJ7YktIV7wNy1w== 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=I+x5B6XYO87QFxX8gHaXx7HO9GmjFiKuHn2tY3hqx/Y=; b=uuuSwa0L1vgndDt4wp2xcBuO1wXXqf4COoeHBLfQJDvRNMCyp6ozxlQu3p0g/EoS2W2MjeHy8I1KQCKqHWU+EEeGPULmXImoAsapsE5jlr8QT9DLvVKddw0VeJ2d/zRm7WTOMsAoq9RuVus+Wkr9D1pER9hWFPL7moHNUbk+rb4dIgYsqnwrSJuX8wJZASD5ipZk0J9oFrjvTuq4Xj+fYt3clABs7ajpCtQl+p96yhIDyjzUtfyEBQYAUDvf+37D/k2mf+tPV0mt2QyYaQFeH2/znBcmK57Eh2p7+wNP25nfI7tm5jmHolZ7sVmIxInaApAsJxz7YIX+D6Y14E00oA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VE1PR01MB5581.eurprd01.prod.exchangelabs.com (2603:10a6:803:11f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Mon, 13 Jun 2022 23:24:30 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 23:24:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 01:24:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [jTrhJ9S5ZlDGPhyp76MuJTnHNG5Ue0cp] X-ClientProxiedBy: AM5PR04CA0022.eurprd04.prod.outlook.com (2603:10a6:206:1::35) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220613232412.759781-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e201f36-ca59-4aa6-10c0-08da4d93ddcf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4ytE6G+o3tmPO/ic0EBElmR9eul4GBpF/byXWtjCQCeFS6+ncbRX3MScqfAUovDpwCEq2Tay7I1wKSreFF5Lvx57aC1WW38w/8ND1GgpRSDidVZ6nIQIIZT6mOyC5D+TqvEERa+q8IDHNyXvG3jMhsqwfBLeuB+VEKUKNBWwNX33iKog8PkzXvRMFwPMRLxFwe+q4/8eK8d4gnRj9VpikUIn72RDXSeTvUvRSUOxUrvS+YJYgG8zxZj/DWdqLqiVcALMVAqGtI/4butRegwOAXAbkM33gNh7Y/poaBGeHlIZU5YCb6c9kYL1tf3a0+k1G1pGrr1l/9CGP1lu+xv+oLCaCIxuPfqyLqmaL5SZA5iCfRnFkWN7Qw8sNHrx93Jna9D2wdtJ6wZT4ZLN4FSiBPbgfr1TOcJ2NyeYIUtasO8IIXkM5ag4j3y+b76k0adRGoGkQmSoNzo+g3xV9vi8tJ/3Ug5DNRtF6gpysPa66976uPdFqsQOV777/aLTpBP4PIiGFENXpcEbQcHVM0l3hXME9Z9Gv31/eblrxxwiIpak63SQmjRupOaq3hXyHYuYMAaXzOvC4vxM4ssOyn+33XmqHB/DINNb9WFUE8Dsi94h5v2J5YZbAHEB17mwywMfGkar2UVAyTg90XIaAo34bkunQ4RnlJXDzdYT9plyy4HRFmc/CZcpU8P/xa/ebZE2wkc04blXXSJdvED1wq5gbu8NPfKicEH3VR4QK6GDG3LriTd6KHxt8FiU= X-MS-TrafficTypeDiagnostic: VE1PR01MB5581:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QWhozRLBlQltSNlDM26htPpUVxfTYafc3q9Jwp8r0ipEeqhtFjDjBtOlkuHnkDi2HfgupCD0T1tR0rKRt87tpAzO0L6/l4NhYUqcGz+Vf7enSalmOB+XMBeVE/3nDQJ7RjfuL2rzheaCfuyPAE8mHawStPkqK3mwnbbTMfuTfDt7KPV46Jj7WBCYuuIWTi1gBNmLAk0SEpMRP8r2MRkBI08akTrierJYXF4cs5iFL0ryBbjIn8nQs7Z+KJE71b1Kg8K/pKHsVq+g55gnzkynWF4I+WG+JdMrxF9+Q1VLEI+hIZwToNmLHJ5YxOqH6BwJXOwsoxz7ndWRCUY+MNmBd1zGdZkdZmrex2fNxoOJgmiYBrrt2kNCCt3/c3KdAqxnleIo813Hn2CHomcZW81CDwMAy6KFDyHJFVgU3BGJEDVHFq/KiuLz1mj63nCivYm4UKGC8SUb9SAFQ3RF54bbOpOWeVyZ14vq9rNFRHyFCy2E2a7ceHRl3g2S2DNQ0I1MQNkQuWybLJ3KTANkl0wVbA88fvn1qtlk59rtBVhOcNFq++G8BIceWJeLuCONjjtgKKb4B8cImZykYoFtrPBv5w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7ztQ8Cns3JyrwSohDO844IXPSFN3u6Hqu2d6cgoNZWdjCmYfyFbwJY2uZp98?= =?us-ascii?Q?DAZaHIS150OFWTXjvEIPdBA3QCn99mJd0JBRoNza0yq+rCzIGxoXpy785xrU?= =?us-ascii?Q?z8NY68H3UHH2mdi3lHFr3njZcU6Yff9KImQ1QwZPD7vlzmDk679sM4dHJYQM?= =?us-ascii?Q?kAeKqtolXfM43VyUD0Y/y7roo3cWUCdibdJ87dNYg+EKEEWTZj/avssc0o0E?= =?us-ascii?Q?j9f35HFx3A//Ri6WjqCumpfqCc7CWI0g2bBGrpa5TbUo4IYYn3MzHIpQ/wFC?= =?us-ascii?Q?wnB25wkOyqhTJmgOZNs6s03K0NRNVmeL/BFLPQgF7zQkdQeLbCyXwyku0FRK?= =?us-ascii?Q?5hN7QGG3Mq5zxT5cPJdYkb8v0C2duEkcibaaU2FefdZq8dghI2kr3uE+hUva?= =?us-ascii?Q?FLfCXX2y3Z8OXOtR/paHT+8Lqhwjo/QdNFj3J/XJ1hjzbDGHpxhOEyHMPpSX?= =?us-ascii?Q?NJQNkqOxID5So0ok4jwxwLGDteWha2cy+eVlUhrVfDDwaLLpAaCoh8py2cNw?= =?us-ascii?Q?XAKxiHjWmvxXBV3o2Rw2iMJn5ZEpQZ7MnVhtkbdgcGvQZHw7+E5DeyPilr0c?= =?us-ascii?Q?iLA0YNENNpdrLRQ/79OsGkGBuQN9jFEbvci7J/JIf7DawKhXBf8zplmkIgc5?= =?us-ascii?Q?oHSYtI5any/romOFKbp0XuP/FqxkR+u/Bqa7/ywADTB9AwlUMBSem8CXGo9c?= =?us-ascii?Q?uTSi7/TVODZHHzqTaHUtMqvIqzCTG2LLYUNffrdD9qWmZvKyH1UL79R/ps2x?= =?us-ascii?Q?DCe5nKCIzYJmJ8fPzcVeIqu8J5iN94skRQFXbzTF8qLO7DYtFx+t7Usaiuv2?= =?us-ascii?Q?AwVPUptbae5wvnSHiiLHE3+YvfzKicaFtuikubRJEKfdUmqi0ohMEvcGbln7?= =?us-ascii?Q?YpstjSjDyNv3H759yT0FJav9yVo85zat1zjvv2ImgeXYlSHUjX+VHyuuiypa?= =?us-ascii?Q?yS5/t8OQS76ZSsNwIcfFNPb1AcDzmVah0AVrueCzWyKULz0A8B1Ce4Owrdat?= =?us-ascii?Q?V3FGTdU1eZWp1+VZXIiaFLvKtTRniAA1KUsSfEcpRY4gHb8162UowEV+7YRs?= =?us-ascii?Q?KIQ/7MrSWEuCI97oVfpEXK4oeogotI2LDlNscpnfQJUhe2uNBt9Nw8JcPSMc?= =?us-ascii?Q?0qW4cR/tmMGrI9qwK+T/Xdeyt5me5HPOej3HM7u+s9I1IY4QoO0nn/G7oRtI?= =?us-ascii?Q?KZs+XQLvC/HwarNNr6w5TKNz4W8+d8o+nxunoz2XH8hem0QsVwxdX/mbX7ST?= =?us-ascii?Q?s9S4bU7MRVI5UgUdTIRgMm+rlHjZWSQHNNH7+KSgoHcNigXjRF9O0eiWCthh?= =?us-ascii?Q?Tv7dqV9zO/2v75GYgnKf9b4PXwxqyd2hxZ1+UnZvmkzE/jHvQwFGi+mptu3/?= =?us-ascii?Q?XAoFHv994VQFbMHtUpRY1J2kR7sYAMql6VRoQ8GadIXoS5OJWMfqbtbgTI4V?= =?us-ascii?Q?Y8azWOYRIrSx5TlrHdCwiti5hov5kopEUt5D38N7Tw5Wd7i6nuPMpw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e201f36-ca59-4aa6-10c0-08da4d93ddcf X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 23:24:30.5869 (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: VE1PR01MB5581 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mxfdec: Offload allocating string to av_dict_set() 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: Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 77bde7c3fe..ad8fb77f9b 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2118,16 +2118,11 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor) &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE; } -static int mxf_umid_to_str(UID ul, UID uid, char **str) +static void mxf_umid_to_str(UID ul, UID uid, char str[2 + sizeof(UID) * 4 + 1]) { - char *p; - p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1); - if (!p) - return AVERROR(ENOMEM); - snprintf(p, 2 + 1, "0x"); - ff_data_to_hex(p + 2, ul, sizeof(UID), 0); - ff_data_to_hex(p + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0); - return 0; + snprintf(str, 2 + sizeof(UID) * 4 + 1, "0x"); + ff_data_to_hex(str + 2, ul, sizeof(UID), 0); + ff_data_to_hex(str + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0); } static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary, @@ -2141,13 +2136,11 @@ static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary, static int mxf_add_umid_metadata(AVDictionary **pm, const char *key, MXFPackage* package) { - char *str; - int ret; + char str[2 + 4 * sizeof(UID) + 1]; if (!package) return 0; - if ((ret = mxf_umid_to_str(package->package_ul, package->package_uid, &str)) < 0) - return ret; - av_dict_set(pm, key, str, AV_DICT_DONT_STRDUP_VAL); + mxf_umid_to_str(package->package_ul, package->package_uid, str); + av_dict_set(pm, key, str, 0); return 0; } -- 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".