From patchwork Mon Jun 13 23:21:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp755647pzb; Mon, 13 Jun 2022 16:22:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoB4fZ1NM1m2+LzgV90uYY+5eF+tZ7aBMWa4sppBT+EMfgVh8MxxjGaFNWDxX+0GdGuS8P X-Received: by 2002:a17:907:7d8e:b0:711:cf4b:9c5 with SMTP id oz14-20020a1709077d8e00b00711cf4b09c5mr1811104ejc.637.1655162527590; Mon, 13 Jun 2022 16:22:07 -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 e20-20020a056402191400b0042df0b0c01esi11128179edz.43.2022.06.13.16.22.05; Mon, 13 Jun 2022 16:22:07 -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=m1mlvI7o; 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 BB57768B1DD; Tue, 14 Jun 2022 02:22:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074080.outbound.protection.outlook.com [40.92.74.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72BBC68B1DD for ; Tue, 14 Jun 2022 02:21:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UiOS/X3949sDN7VknpNYZ4oxLkjxbQwPb9rJxmPNxm7hreUZvuxaSK5p0pka25pBREHStdUbqfwjTSE8rYG2qllkCqKPIgu9JaK3EFXn1j16tQDESuO2OE621DB2ZIbGzXvFkzOY9vyiZb1WyVB7qw7/dbNcQ4kE0+htdXkh6+NX5gZ2hPcWnG9WJEe/5JXfk7Tum3rvc6OtMjLGA6wJl/VH8ZrkcCpt9GaGesY5fQALSkq3m5mjmn5lwbhl0EQVar5JwcoP5c24OE42xbWWZoTS8eExoo5ZhKqVB3YFnYTWpVUozHKS/tU94lgYujIbiigqeZHXskvQBtu09YPnLQ== 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=R90JM4o6ajGTdF29/yzIMls4bmvOFw9JInf/YrRjsT8=; b=WofZtlQ5RmhJaHkDebdfOYtMY5JxVHqL1AsFkrZnBQXqggFbcWUy7BXGU9MkI4wi1O3EcvyFRI2/ucMfhzISqloedyOMZULZfv2wHbvhwlSqCF0DQ/LENEvimZyYe7PpdVR/LrN64R3XsUJT037RxmCjjH4ou9o+0iJ5IpxgH2Prd5j6yl7A3QWd5HiFDHi3x3N2zHff7+51UQC3SbRAvBI04AFOQynvJ6oFCkMFgmgGdsWismwJEJKsDHEXn0murGZ6Wzu6AXureVqJd69VqWdDVAn6dR6tPJTOHNi9NxfJCeFWzETUuapyrun4353ohoBNBLlwme6Q44LzWzR3NA== 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=R90JM4o6ajGTdF29/yzIMls4bmvOFw9JInf/YrRjsT8=; b=m1mlvI7o+UnYdz72OQNyDoNk7MkVpWrdMIzmGSnXHHt3C16o3h1hChp11q6tiJF3ceNFbwuj4J4weh7HDseNTxsDenGVpqAmxNG1a0Atv9K8YfZd2ZTICnLUvaKlbseGfXxcK9c0N2nXHNm2riEGLKjp7LOvX3v6YZlHZkh6TDFb53ruFnTrLgsCq0jS7arQ0m2cbPW7SEpGSgmcjvBHsXtm1r/uiac1DzdDlXk5tVho7dZnSEl28j+gAYvioSIkdLl1IFZw6U7e/WKhSzm22C7m6i3YytE5WEf5v9VqAapx0LAG4IUSTibYyv7dlusMCO6StITCd0dMfTfIrPEQ4g== 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:21:51 +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:21:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 01:21:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [RNw4gxHHy6Huf4idg1MErBmyAvwgvCp3] X-ClientProxiedBy: AS9PR04CA0126.eurprd04.prod.outlook.com (2603:10a6:20b:531::8) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220613232144.759191-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c8e170e4-04ac-4ef5-172e-08da4d937ed0 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WonlsmQbMk8hUqf8Z2+0Umttdy/liK4ULEvYPTm2ejZWPRHgmnWFhbRdrskEhspSeKpApl3cA9QAYVbqvgq/x4E1q8nnoX3nCwI4QdSEbJEZSLHCIVj9v75ZPrI9h6wBrQ3RHS+vSOVsXvwUHubDMA5jF+xTGuGOg0iZhNfZnnCv/Vs8uH9H0ziPiQVWt+dt1ftRinBva3VTon+iyjD6C/4Q6RFnG7R2mBbjnOWq2idTURVMdU7csTPF6C2DNJdMcplAIw4Zvp4bpbXaqi5TSxV4YtVRxVQ37/ckxIq4TT9mTejmixJHajCdFc5gbmcxw9QE9qBrZVjkSjxPJ5QEFzf8gjt8Ayv7CQEs3Cyo7C2RX3KePlsTafOSi2vDBPn8Z3lc6eUe2ymYCuj1cUSXE2+GRulX5dMZ1ouiKSOOrrL+KAyZ/tEWDLbhte30bCBBYHX5GGDu9PrHlTGQl03tHYtrR+8sfveW8r02dpat27YbhsNDWnafGHk+ZYs3xxxWqSoUzmaV987IDUngCCe4r4RRwJvrpJwTYImMvpKBMTc0QcG1ejYGl2SKribUJJoNhC48MXp7dYd8sSk9oSoLE1+TDKZVkeVwtzgT6hthBz1vc+zXpEuvNl8OlMthK100cPdbHa6MHP4Yn46GnptE7yijcq6aw9TnrGrcf8zAp/CgSzg6HfvIDriseNLjnnE0q8dLAL4q+m6Ci/ue3Noz6n3mN6DtHkOxcwbjNqAcQYS3L7wLx9gqAOmBaWV9o2ReuIU= X-MS-TrafficTypeDiagnostic: VE1PR01MB5581:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XaC0fIvbOaB/ms1z2HWHRDMT5s9hku7kZkmxAyxDDSgBO4QTXODA5YAGdSUwUxs+zW+mXf+Ly7H3E0OORoOuL6SoWUd1EpDhVRrZX9fYUBQ8wUegr9zYsQZ+e3RJB9HN1oYa9QeGOCjG5nlIGIfZnkAMSzL4HhK50xKl5rmWLMD/j5G6o4BZPLOEB04ZdJZPA2Dh5ehT8ioGRZCU6i16FDgT/YMmKkRzQYxQy2JIoJ+TxnXaGxKg4PSsRfzRRHj1EpVFmj0QEvOHpKDMzt4UJWywBLKLRVBPWDI8jWnVRCbzP3efstoZkQtm2Z9USluDCdpn4FsEsMmQUVf3N1ZFGFC7TdfnGVQ3VuYr9QNQDLNHZRaNiQroldfERYq/uiI2qqTcim5apL18LKA+6OlOssTqRGR2qR24Y02F7l8LGwZIRYV0QzfGCs4l3DDm6LLmott2yL8++I4XbtSH9f8mm0Y9vKd/DR7oUewpZXC5Z0bk/akR6b0acfF80ILEtVBAVm8agwTGbaj+FAIJQ/2OG7LVD2lPkYzhQePC4O57/5DttynlODiiaIr4tBikCkT199ymlowU5/dHB8XKKeldWA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IF5YUTfvtCsiHzGpvGd4u482qiSCMGWVL7R7pSCq3ix85+U2KIDR4j2TFLsGt5sYOY5ewScJHnbeHnnE6rXrnbGWRXhFya2MyRieowCdFeOgJBPuaJZo8wCUawMcscrVMVWKghMgSTTP8jMyEVu7Fa27SndWUt8AbrgDlAz5vLjyJE/3FlGXhA/ck15B5jxkYoItf5hh6hKOL1ALzrISu8CkIM9fYY67KLsxJm74CaU2G7IIMvIWhn3qTddSSaInoVXIQI8LR1j/B51/ktQRl0iaFCkuZ1KpmbOqCq18t02XZGtw8oWfdh1ZvjnIQD1zjJ7v1gqjTZASQyboKpdIf5cyQmqeftyGPzPrkGCLXioXEC1MTsxitN1J23O/dyQODT/vprliZm35DR0L9BSFML1HLYEnCalmTZ4SK1Y4hxvMnqxUhKza1TdMs9ch5MX+N5NL71tf5OtRfY6Moz/L1b64bdGJYu62grvaNctDpiT0gDlS6ePbKMELS4Hs7n05suLO6sADStlNztDNkdJu+ZgXJdp4GaQi98bsA/ior5aWzL4pSn4QWM9UwaoqfPce0jSzPk1UV5Whx5ZEpsMqrqQKiD2rOgeXGdFsyYVqDp13jXxa0DaTMCyRbT595M5b6roiwD56L+zT9bZxMDMrcWrqV67YLAlDlWVljjGqJhcu1g7l0Vj5prk5gkFCkY1HtuSqi8uDo7/x747kj+OulhGp/6v6ZEevlAjTO9HQX+FfOVjQSeQ9c8EYquegBhAwL2Bd6afQFPuJ6ubqz5yR0csvA8Rhhy06aESZ7PwWCkvPwOejub799HvtcUWl9Vbq/0OHcOkYaxBrjAU6lzw4Uhyz4Q4YOp9MDZH5ybiOIKS+UpAY5uRZqOR7yLNq6upf4ZB4k17oF1qcBMh0zCiqhzgOorIvpXpDuVHPmu3o3xAFyrm0AUDKo3/3cBY6gQCmR6mYO51bKU754fbaUHj4Hz7U2ER5hAirDLio1TtB6k/Q1XbI10JdSCzPp5XfHjtFLeflik97rSJu1kEhCvnnh3oAONNJuC2uP955swr5V8YI120/6xoliwwLhbJu/RkGE73pWMxXC4Q9g9MA2mray+m9HDqkDwh8cyAlW7P5FjDyFs+2Gr4+Pj87iYEtzNhH2tzrnJNa28Fvqh+FkCGEwI0mMz+ZSyK8LA4/n45J4Cp4rh+sHAezvEtwPGoAbBWAD2r3H0xd5ZIcIkOVAsbQQ7lyL0HnWOQsNuEkjMOMYWEo2GXB06tslCX3/NlRHQAH0abw83tUwBRvaFnAYuki1M55c5GfB79DfcNDa4RtSGgOuUGNM12y4+tKsmkpxm2nA2Lf2nTpbjX6DqnOpIZbQHL+TdYR9f3p/TURDuvGgrzBSPZdo88bWGmc735WVVq7DVAJMTWI+2FZ1DNBmmTg2bbqyqmU6o4GdqEVDoJ6D9+nordY1O5YGlVi/iDk+gb6rG2g74kCr2fQ5Z8bz2P9PQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8e170e4-04ac-4ef5-172e-08da4d937ed0 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:21:51.3663 (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 1/4] avformat/mxf: Use AVUUID for uids 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: FYilkhzgS+7p This is in preparation for using av_uuid functions directly. Signed-off-by: Andreas Rheinhardt --- libavformat/mxf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxf.h b/libavformat/mxf.h index d53a16df51..4d9f5119a3 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -25,8 +25,9 @@ #include "libavutil/log.h" #include "libavutil/pixfmt.h" #include "libavutil/rational.h" +#include "libavutil/uuid.h" -typedef uint8_t UID[16]; +typedef AVUUID UID; enum MXFMetadataSetType { AnyType, From patchwork Mon Jun 13 23:24:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp756571pzb; Mon, 13 Jun 2022 16:24:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vVBPIIK8oUznnMppglC1j4jgforCgvngr5u+kaWm876TMncehruCakVKzb/ky1J7CPmhEP X-Received: by 2002:a05:6402:b09:b0:42d:bd80:11ac with SMTP id bm9-20020a0564020b0900b0042dbd8011acmr2581659edb.244.1655162673360; Mon, 13 Jun 2022 16:24:33 -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 hb13-20020a170906b88d00b00711ce8500dcsi8338865ejb.559.2022.06.13.16.24.32; Mon, 13 Jun 2022 16:24:33 -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=ZoC22sLe; 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 661EF68B5F2; Tue, 14 Jun 2022 02:24:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 3F7CA68B194 for ; Tue, 14 Jun 2022 02:24:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Llo8yqqJ68CnKyQQV9Np+wXHEm2cD2eWxRRmte4jSAjx82UvSlxhdm+0ALDGMQwO7y9qmLmNMYwo8f7KAFowyr3uwo1+5kppoj8cz0NguhJyIHkuYTDaf+ChHUnHpsjv1Etr6pboMjtl8+UcI6DlCzDVCfd0cpFoZCZxwDNh17MIAKV3QZRxWgmmo75Mzpq5f1y9psz35F8c9ohDgyOar655xZa4OrVc7rDTvJ5u2L6XRlo5Abpi0fDU5gGWsnwwUPENnsTNcTTexZy77BkjHxKIShN4Rs6qQLxJF3W1yVpSN/q3NVVDttBGq12rnpjnTNrbG78FMZYF4ePQHwvFyw== 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=kJq4rmI7MyLRghz7iYbgKxPOwcSXX56TU3bUTUa30+Q=; b=aAp4UYxw6NvdSLJGNJXd7CrQXcpKvMTTME/4wAUAwv1puPCUe4Z5ZuM6GOrw7Ok6/Q0KmhE8brnQmh/tKCRoi5GGxakWV5N81h2qEnr9KVQqy3GnzoLQ6i8Q98c+V5OSoKIMkM5w3ViIMsI99Inpf//duO4p4LIlt/qTylrTJ53Ul3J51Vhb2GCg31LGEO36nUcYE9L2oxbYz8HphAE6WEVtUMhL2KwSaYBK1AgDqrrKsTujNXxU5NFp4QaL0FpCTcTdxo0jR19yIacVl4F0xTcjKcGUWbJNmdCWfeuaT8yq4Q04nrROxhs0uV1o07Amq/e2y9qOa8EKixujNsz/HQ== 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=kJq4rmI7MyLRghz7iYbgKxPOwcSXX56TU3bUTUa30+Q=; b=ZoC22sLerkZ7SJg6paT9vLEk8rBj4g82s9eBObspS6xImKhMfZOdwJ4u5IhuMzmmFo7FN6b9RNkAChyScr6KSOl2yRGjB3degOr6douWvdJdOIZv7Dh3xO2Va6LXORhked6lwMEti8EufPVpcDGOdUqTt/Wg71kZTX5pGocb9+LFUr7dr6364xEJKAxuYfv+cBQDcFrrUZu7xpTvtMlyaf5c2k30f63mqAozP4Rr68XruBegZAKoNc0TQVFVihgidM7cugWsjdn6tgbKyO+pN3qREDFVUwyBKqyIQI64z3xfoGnTDCqmU7IQMTkqOeZRG4gbOYGhW1bmJVPy5YBS3A== 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:21 +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:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 01:24:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QzpxdM+8N8sl672Kh1RtLaVvKcq1VjGX] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fbbb31e-89e2-4684-d7c5-08da4d93d846 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WonlsmQbMk8hUqf8Z2+0UmttlPMsSa7pIDeJrJbpWhxD6DZ57AJFa9lHfCL9cvXcrutCzIaBwoOWr6443BJ0fTfJWihR8/vxg+4AMWknLqI041LEjnwoLxXFNZolQqY/ZeyniuAF45DSpuIvAfkZM3ABoPZAfR7tMZgLsv24BopTFl8pNlJSkXZvUjjxI1D0c44ru6zpon3ki9CBg/b0hMrSMYl2JQyu1Wd5HJ7fDR1x0Ept6/2mAC/u0ZKAkFzb+nl9nmPSpj51jLD/2Wo75RuwY8ipZfwVJm5SOGOZXfWJO9XWlYZRKjXQthFIFyrwdlEtFQc8a5Q+ZpM29qon114BmJL4zwx29tU6TWum1mg74tHubizYqGgI+0FyTp83LbyvCspqH1IrRDoWlRCWB1vZt+6PrWUI2skDoPSJKLzwIsb7snKl8lne97TVXZ4Yx9SPQQ6OxCPNtlTqeQaS4FFeZIGTk8ZM2ed/oN3HqzaFxyoR+XsfJYUMP+vWRhLr2AP3FP7HxFYo9ZJ86SjMhZmTae7fCS2YvI2I34LHlzlsP8oPQBt0Lieb5yn3CZt8BFfL+Jk3dob5GEy32Yy3IDH68aBhQpINWoeg7Ur5fUr6RPD2dAgBdXas4scWTyo6LR4sFJUtVNvgPXP6bITs+XaHAYSuAwv0UG40/8s93BvqrqK1Pfo0aPsIozrzJqvA+B9FFgB7Y+jFk8SqpHCohEDqm8YvEA3PUQY4pV+0r5jzyD3PKrnC3hVgji8bgkFRVQ0= X-MS-TrafficTypeDiagnostic: VE1PR01MB5581:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TY6dFaT/Guf3qQOWKFKMwMeTRQhZCYvlwwEaAXyEzU+S53fXGcl+7UIPhr/vHYXEyE81AKdXmO6X4jEyzSpetKDeDi7Wrqxn+QdQSQaL+U3gGOKX573E3YBy3/LJh7oiZ1G5MiA7wZJZUhmR9fq54HaqKhXmmbsitPl/pC6gY8WWncJjY1tJRqWVzAo62DLAHGn6Nai7T1mcol3rjIcEnbvS0ACI8TADRmQ3xkDJQ8VLPqljxg5DEhqas6SfE2jCfx7A4mrN/qhtpx7o4OFu5vWROdMYBBApKIXzF5eRfjAMpqPt6sqDHeiCVUZ3m+3AlrR57Z0cd1Tq3vpwPo8x/q2lMteQc4hW9HL5iW2E/e2T2cuiLXItVfsbLyWCsjgcyk6D+qw/7PXtjgcX7Hvz+4ZyuLKHhWVAEwFUAlRsXpbkXsTjAqQExEuYYWIc/kmfjI8fCOB27pQzLdw6YA7YQZWSbVyr0bfBrxKszEFTwoI5spe37Os2Lqrnnc+n8ywepwyQHOZlr48kGMr14/lOTJAIZJwW0HGTOPJa2cx9DEnwuFYFnKN38SG/jcJI5LsoX/MhIn4el6RscnQApZlr5w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i5ojmD1s5w4Vk4IhoGr491Sg0mnkNmw29btB6FQigymiKz6nVXqhsFxroqVy5flbAQQgat0PpP0Jci39pDfTjrr0GovHjgYdmhTG3DBpvWWl47PlzjcE0kaU0NlucFrFvyMHQlpGRLrEWNIRruhGf6d5fHdLHIyQKqnhOzC14ws0Djal7iZv7wiLXwsNEJgh/0jQMJWBBhW4s3SIQ6LUqtl9y/j5LOcbzut3kh/EvuvQAQax4rQka+yIZ+KFmi+pq+ARv6wErYK/5R0DNsh2eeoNR6G5JJSRLx9ribYSref9uM+2bQeSiiyXZW6kkNIkJ1eQzYn+LL0RYkbnViDl2QsM9l5buZlj7QBZsjGgc56VxVtnrl8V0kUbMpekf2UrEevbbAgR+gcqJtCA0JsPoLFPvdfayqbuTGvEJpZiPZ3E5zs+EWgEDBQOD1lPb1vSdvVQMFBBLNyR4M/3HAYR3ieQZYY5Co4nuiqYT/23jnNLmtXA1TeWH9Et0NaV2JjSRk/dBBeEcTJJw5RORqXyaf3KaEscx7+XaVlAzA5gsi4+XValJN37jev2dg3Km8lYi7f535Jkhjcgb5psAi2vJDvdcIn8lQjwJ54BC2FzHRlZjYxybrRaP7px12djjW5Aa4m6t23XLCyMP7ctgvFYLLb2vbHR6h/SR2+zpr55SpgLBwDG4kdX4iXyr8LK0ytPVRddKFMIq+ckD4dFbeiOVqeeSWekMepuiXHUTqq7Br9Te8eRdujPiAakOKEXnWzwFs2yOYYqDQsDNomPEdZDamsLSIK4ikGdiw/POvp7/82R90Mbm+BGcqj4UhNslWTuy7uhcXkDRHIqsQ+rb1oTm4hp6KNvLM1AjUmOF3CXug6+v68fKF6whIcs5yqLaC94dbeaBixtgl99AdfuU3582VCzq//Zz+41KP9NAoC8YEimcajr3TJngyL1U4q/nisg/L8C1ATUrQELdW4lu5/g00KTyUk0xHUllt+YK8VqYd26C2cIMw6PkP3tDjO0G1+KAypVAHG/KwnirtetvildlB5V776FQCFuEYnA5Bhme9xQV86NqxbI3DZpBw2SLNE2D2YBzz0T25P4pmsXw7sqmfjOy59jFwy0z41BzANBtDH9LU7fbcF8BYE3JHDkQWHCk4C+p2n+HelYkz/jHqFaaE2U3BvgR7NIy1/clUyHGIH/zeuGF4REmjGeZD0sSNbt0K91M8kr4JzFaquZPTj38IDxlIAIwXoictlnYVLp9Z6r8+gkUqX3E9F37XKGwYgM6eeyTVLSyQIJcgg3EU/AQC3O326DvdKPCmJbM5Fc1QmGxQ6TvPSfKAKN3RUy5Je1BZIp2n7ixi62ihYm3wv+Gf6pEayf6Y9jsGd666rycqHUXISG6zIQ3QCdW2XAoqe4Y3z4ksSch34NhxYahABpDGAGcXOcU6/NlUNU05o+whVDbqKos8jPJKhxeiRVWgWEG6FKbZy3Wc1DUv/jHKAVEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fbbb31e-89e2-4684-d7c5-08da4d93d846 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:21.3055 (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 2/4] avformat/mxfdec: Don't duplicate av_uuid_unparse 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: Jd0Ru+VZkzxq Also don't allocate the string ourselves, let av_dict_set() do it. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 6a22c33995..392066b65a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2118,24 +2118,6 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor) &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE; } -static int mxf_uid_to_str(UID uid, char **str) -{ - int i; - char *p; - p = *str = av_mallocz(sizeof(UID) * 2 + 4 + 1); - if (!p) - return AVERROR(ENOMEM); - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2x", uid[i]); - p += 2; - if (i == 3 || i == 5 || i == 7 || i == 9) { - snprintf(p, 1 + 1, "-"); - p++; - } - } - return 0; -} - static int mxf_umid_to_str(UID ul, UID uid, char **str) { int i; @@ -3088,10 +3070,10 @@ static int64_t mxf_timestamp_to_int64(uint64_t timestamp) } while (0) #define SET_UID_METADATA(pb, name, var, str) do { \ + char uuid_str[2 * AV_UUID_LEN + 4 + 1]; \ avio_read(pb, var, 16); \ - if ((ret = mxf_uid_to_str(var, &str)) < 0) \ - return ret; \ - av_dict_set(&s->metadata, name, str, AV_DICT_DONT_STRDUP_VAL); \ + av_uuid_unparse(uid, uuid_str); \ + av_dict_set(&s->metadata, name, uuid_str, 0); \ } while (0) #define SET_TS_METADATA(pb, name, var, str) do { \ From patchwork Mon Jun 13 23:24:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp756605pzb; Mon, 13 Jun 2022 16:24:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBQ1PI5g0IKDmRjwAbp/0PNx3/SUlPd5v41pQfIhTVi0fAYn3jtuNIQsGJmB9++8QtEl0I X-Received: by 2002:a05:6402:2750:b0:42e:3d52:d270 with SMTP id z16-20020a056402275000b0042e3d52d270mr2515677edd.332.1655162681661; Mon, 13 Jun 2022 16:24:41 -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 v26-20020a17090651da00b00711d56b4ec7si8479020ejk.945.2022.06.13.16.24.41; Mon, 13 Jun 2022 16:24:41 -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=IVed2aQc; 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 62DDE68B607; Tue, 14 Jun 2022 02:24:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 551C868B194 for ; Tue, 14 Jun 2022 02:24:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ge1As6OUFpDat+7eG1C2+5b6LiJDbgGU+AFz/8/5LLvZI0Jn0oPm5FX4UELPXWJ/QJge+CnlQzRy4LQTXzTjYRU691hFOlkcnTfOTW9ScMC1h2GjEeECK8+VOkuflyYd0GjiBwJ1AozkzrXBZWGliqlU60Kx+zFgFTJ+CEYFnQMeuCVVFaOtScANcNGUZydeNewJGJjpJm2U/u9n8URSe1VXG6xFn5uKH1JCrIgpkHm5CMv181teE/FUJha2He4rRpNYW3TGw6Lms3KgcPbCUsQ6l1fRCqXpnnkHxMAfGLBIe8WsjODiQxoMg3r//99ciCNwnv51kX1j4u13VKvTXw== 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=TXjBAzOQsnxQsUDkr1G59j+rnpseEojkBCwZyNi7xKk=; b=fIDoAu7wf0VeOt0ug1+CTXcrB7r/SQET8Dz1t1hsG/VUBgBv+rPGMtZJzHAQQJ/RZSR7t4gpER3s0V0Cj4/xRhNErgNQrIVCN0GD7zV8FsV1FYsZ/6SRbFO/SQtveVCJAGo1XCWEhvvY5JtwrviE0yASTtNn6P7sfYWU4hMnvHE+iZ7goVokKABehtmOt/+YoSqoDf78wr2NvCW93+K4v84IjH516vwCgYb+4DVKgSqSX0C2YNS5JsYsHQG/WKIeceNR2BuzkJx9/jMpB58sq0eV3Ctg/4LSNMkkvrWgzblAbXqH6gMyoe1pPEpU0HYxbAtoBaq8qLzgS6Fm3JABLw== 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=TXjBAzOQsnxQsUDkr1G59j+rnpseEojkBCwZyNi7xKk=; b=IVed2aQcIKTAbr3hdEtmck9KETDOraoIv+AAMYKaYmoSWBdOKX561Tp0bTvr7oVk9s9pJr6EizL1DxxeceMUptIZdcH8K/xdFdwXEXqf0Ksyq07Eva53KliHdPC9ae8YgZumtXVdbD++rPW57YO1++HY5Ke3Dav8M2GtykKKjam1+O92+qnW1JnT4HYSSsnjaWq664dZR13J71sl2nxf5rBqvzqLnvSfTBw5lg9BXgpA3ncjsG3X6Q38toPKYXHhfl0zfwAyxLW+3h/+Umq1YDIc45tpCylh52oH3usKZborapuPaGKr9JxDqRtJx5zFb5SfAazRB7OQY3YBMg4TVg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 01:24:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kBUqCZJ2bOvWjHi2ImEDQXj/n++8RZnA] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf7baa36-a24c-41c4-7ae6-08da4d93d98d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4ytE6G+o3tmPONWqgYEmmIuAHxPWDNeaLmjiL5W1grhYYa9mKwqzWLLKnTui+i2fTE8IS6hE68koCll93XDf3UNeUD5sq78aKFrHpvhKfzra5NvQ0iriBmCqD60Aw8MSkfWYP3D5iBN3DCk7zeDmvJ/ulz7ZDJYYeqPDQQ6mb9D9JZbYOtx1X1d1IhUIW7rBoGs/DwC/8Sl5VJCLGOIL3s0UOncebVC+AsQz5JSbP85xqCvnpC7oq1rlLzKhruoCJLv47ufiO6Qmj1HXoFYq2VeJvI6uOgJJNj9Mx3QhLJvMDI0nu57npowpTsmd6TGwSDj5ZDW12PmnDdkbuAdo1fGRMMtcFdRp3Vf56p0Cl/eTrJGewQ9ojkjgQche/rE/i7hOtbHohN8s+Rcq5hjkjmvAsSELEz7wzsjnv0RQ37e9CdloDOa6Q9hpPySsgqYdKJ8DWB7qIDPyYVSWzYHuyzvbghkYkrB3stgJW7UPHuOrNpyT0KuVDJSdXV/2gFZX5D+gpv7OGl1KOU8RY4SzGeYKvebKgaX9h1sPi+7K+5qDsjRpswQIog1fcsxMdkQZXu1J8GxR917cBiSuIgcUMCIZH1zWTrEw+NZAVMVG81tVZGd5lioUV4Ohdp/navx+qTGMr6LTu5+Duig5REmxFrSD8DfZYax01CA4dODxeUpCBU+hJ1OupJgu3IGqHPv0UoqozNuPR+DGHR04Bfh8pnceicl5kP/eP+RLKQEkcLPRsX3XTXP0ftE8= X-MS-TrafficTypeDiagnostic: VE1PR01MB5581:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cp60Q7hX/lxFFjSpSXZ5F2ixaeY4tfPTyHPaE1STw/pxqaTtpvJYMubVxS/+mGheRNMSQ0M7cKP/scInQHgxWtKj/yRZzvopo84/r6H3n8EvI16RM8Cvag4b/y2kE/d/undgoP3Sr13EEcOfzFRrkKc3UVrCJFDj+kk5TmRJi/oHP2Y/cSLjbdHWMLAvM8EIL+Mv8VlyFLYqSDg50e4xDd+i2Q1Z78I0S4s1GOwfnP00t8WpUk1OSiDEYrjdpGGYSo/d1/uXfWm5NyENfTgIdk+jK4iFxyLexQSj1L5VcJ+6CJaVaee+Zt9bY06k9uDz2cdTRVBL1OBt15oAu5ZS5c1c1RLEB9HGmUQ3nGBqqXx25zEtDJOxJH2l8qLBEVwpd1/7C/0mQ/rUZEz9Y4HTEN6hRV03tDV4N6bP2iGh94DRY1TGyXzP13mMfGq78ijBJbbYc6kHZqEs5oag34QU0quyJxR5eqXfivyyuQnW8DMnbfoWCsbjQ1uoNg8hn3IYQn94qkWlbeLhiwkcLmWVC1kPOcvj3XTJ/lpLOgpfmA0oUgI9Fys/JP3BSd2yFyim4uDa9ldq+Qd0px8HHylcWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8CmNz8qDL9uMP438qSwy9qjPvrOhvBubE8L+UrYEXDvek9C9BG2SFQf2j/uNXAAhhTPt0MTPurbEicAJz3Utyh5FNcpwbcx3MUUkDbvPyooV+ZbRhBRp7BFSotAvjiLzBhuLXJIVBiJuiLeDnhXQnW2lYgIiUGxfjGqlpu7+QnqbdPPraf5BNTevtUj6iOcixT6MQCKckceePhrxZv/gvFY7yKsD8vAPuI4spPy9CRKDNi6ccBOfXqInwIJw5bcIJ+8mw3uoEZ4WIikEztuFmu9UbPk5yhnoHgiaOVZX/N+q8BRVADkYZbulNQYeUa0be0bDqUlkZfcHhfsprlvEs7x6b1JPWIs6QBmq+TMWduZWoqjVTa4SvJ43SxbmH31SKZCg+TW7e0UfC2LCz36bAV+VnZsrTA2AmadIBmjOy++UcPWHFJxA+1bfkvgHhFVgPY2mRBR/5uEFwOzvBsoN3qjSQ2vvKu4d9mwYaoZwE34or+k3iy0Ryg/toHMbKIYr13wK95aBZEWDsRJeloEPi9oMBnKxsbXKfEQEvcsda7bfUXkqv7OptoztHBiW9y3n6SxBG2PVwg1asm+9PFjvIdf3sEQPkc+PxOaxgu3Y4XlQW4ETUp9UpK2q7qCDTQZgoPTIavr4L++kOnAOKK/buMpqYb5J5oJW63LuGeDmG8QzLEV+waGe1lkYXyUhJPWe3HWpW4J5+7F2Dq/n2vJI6wab/OrsImPSS102gQGZtNheqTf127kQCz7UkQOt3hwQt9LStYMhbdj446VOzSFjwv67oCpXpThPyNMAYzvoW3PFapkqzWz8+jOn0Zk5D9kHwTmDhuOGN72WuVvRidcgaQ0rZvbPoiUDTPC3yES9FOz7uJs34qzeEFtAXcLVD7PG/KRNxCcHvQidZcG4SyCtK08V4XGjsV1x38sMm73xjnR71E/BmRzD3FXeiaK6qeu8CRhVg3j09Jb1QjzDbSkP+c6JbSktRtJ8h4MT1vhCp0o3ecMa03jXqtuWoTR8bEYbd/E1AIX4i0ZMqwvJQSlCype0R2PKv65LnvtiuNKmOO+baSE+ni8CKPW+fRF0cR+HMe4Gjsvuc1BGBWh15rPqZm71dE64Z4ACvqWHVBndpypPVEsVlnqb1f4AB1WPU8ChD3+33b1uSxkd3e+AhC+3/0qgQH8BE6inn9JycyXhCL9K1V+En24WheufL8aaTJexn8vNgsAwQoNsUW0ZH52W0+qRzuCxHM96/RxjL4KBW0kzLqbjccyUVQnFCKuVJ4AW97DG1J0CLTO+trU2VMm5U35xViHIsKGCAXFREiCIjqNV6YmqUE67rLdYLYgW/fzsIMb3EZEyD0uTzigv7ZVH1e2rt10+ANhLYxV5Zkqh4luVCuG7GnexCcmy47ppGOH0XXxxFV8HJoS6bMkpNAya2tD3hB1IGCY0gbZHEwVqfLK0Xd/kyM8CXtc4kcEaGdtdS1oVuXqwmq6zNMqGxIUUrw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf7baa36-a24c-41c4-7ae6-08da4d93d98d 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:23.4774 (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 3/4] avformat/mxfdec: Use ff_data_to_hex() for data->hex conversion 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: 8y1U0eB2vQ15 In this case it also stops pretending that the length of the output string is somehow checked (which is currently being done by using snprintf that is called with the amount of space needed instead of the amount of space actually available). Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 392066b65a..77bde7c3fe 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2120,22 +2120,13 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor) static int mxf_umid_to_str(UID ul, UID uid, char **str) { - int i; char *p; p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1); if (!p) return AVERROR(ENOMEM); snprintf(p, 2 + 1, "0x"); - p += 2; - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2X", ul[i]); - p += 2; - - } - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2X", uid[i]); - p += 2; - } + 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; } From patchwork Mon Jun 13 23:24:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp756641pzb; Mon, 13 Jun 2022 16:24:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v6u1IJTujQKYcW1n2VAC6uk8JU1vSbXH/rkVldK2fqgXiPJLvbdlaOFqTKAs3hxzHtX4mV X-Received: by 2002:aa7:c55a:0:b0:42a:adfa:9150 with SMTP id s26-20020aa7c55a000000b0042aadfa9150mr2539430edr.57.1655162689731; Mon, 13 Jun 2022 16:24:49 -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 e14-20020a50e44e000000b0042f4ae66c4asi8961102edm.148.2022.06.13.16.24.49; Mon, 13 Jun 2022 16:24:49 -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=uuuSwa0L; 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 5EE7368B611; Tue, 14 Jun 2022 02:24:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: 7ztQ8Cns3JyrwSohDO844IXPSFN3u6Hqu2d6cgoNZWdjCmYfyFbwJY2uZp98DAZaHIS150OFWTXjvEIPdBA3QCn99mJd0JBRoNza0yq+rCzIGxoXpy785xrUz8NY68H3UHH2mdi3lHFr3njZcU6Yff9KImQ1QwZPD7vlzmDk679sM4dHJYQMkAeKqtolXfM43VyUD0Y/y7roo3cWUCdibdJ87dNYg+EKEEWTZj/avssc0o0Ej9f35HFx3A//Ri6WjqCumpfqCc7CWI0g2bBGrpa5TbUo4IYYn3MzHIpQ/wFCwnB25wkOyqhTJmgOZNs6s03K0NRNVmeL/BFLPQgF7zQkdQeLbCyXwyku0FRK5hN7QGG3Mq5zxT5cPJdYkb8v0C2duEkcibaaU2FefdZq8dghI2kr3uE+hUvaFLfCXX2y3Z8OXOtR/paHT+8Lqhwjo/QdNFj3J/XJ1hjzbDGHpxhOEyHMPpSXNJQNkqOxID5So0ok4jwxwLGDteWha2cy+eVlUhrVfDDwaLLpAaCoh8py2cNwXAKxiHjWmvxXBV3o2Rw2iMJn5ZEpQZ7MnVhtkbdgcGvQZHw7+E5DeyPilr0ciLA0YNENNpdrLRQ/79OsGkGBuQN9jFEbvci7J/JIf7DawKhXBf8zplmkIgc5oHSYtI5any/romOFKbp0XuP/FqxkR+u/Bqa7/ywADTB9AwlUMBSem8CXGo9cuTSi7/TVODZHHzqTaHUtMqvIqzCTG2LLYUNffrdD9qWmZvKyH1UL79R/ps2xDCe5nKCIzYJmJ8fPzcVeIqu8J5iN94skRQFXbzTF8qLO7DYtFx+t7Usaiuv2AwVPUptbae5wvnSHiiLHE3+YvfzKicaFtuikubRJEKfdUmqi0ohMEvcGbln7YpstjSjDyNv3H759yT0FJav9yVo85zat1zjvv2ImgeXYlSHUjX+VHyuuiypayS5/t8OQS76ZSsNwIcfFNPb1AcDzmVah0AVrueCzWyKULz0A8B1Ce4OwrdatV3FGTdU1eZWp1+VZXIiaFLvKtTRniAA1KUsSfEcpRY4gHb8162UowEV+7YRsKIQ/7MrSWEuCI97oVfpEXK4oeogotI2LDlNscpnfQJUhe2uNBt9Nw8JcPSMc0qW4cR/tmMGrI9qwK+T/Xdeyt5me5HPOej3HM7u+s9I1IY4QoO0nn/G7oRtIKZs+XQLvC/HwarNNr6w5TKNz4W8+d8o+nxunoz2XH8hem0QsVwxdX/mbX7STs9S4bU7MRVI5UgUdTIRgMm+rlHjZWSQHNNH7+KSgoHcNigXjRF9O0eiWCthhTv7dqV9zO/2v75GYgnKf9b4PXwxqyd2hxZ1+UnZvmkzE/jHvQwFGi+mptu3/XAoFHv994VQFbMHtUpRY1J2kR7sYAMql6VRoQ8GadIXoS5OJWMfqbtbgTI4VY8azWOYRIrSx5TlrHdCwiti5hov5kopEUt5D38N7Tw5Wd7i6nuPMpw== 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YngaVHbF8LqM 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; }