From patchwork Sun Mar 10 14:15:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp742103pzb; Sun, 10 Mar 2024 07:15:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVILqM7YXQL+LyXlf0TRTmUCOJbziekLW8Iotpzm6ihsPksjdaMmGbQRCqx860nYyRRGHnJYuhw7GJ640VwsQzPSIW1pjwolsf+Rg== X-Google-Smtp-Source: AGHT+IGshUgdzZOFqLWVhKGu2uF0+b6A4fK+NLZZmg8tni3zcL6imgApKF1qvwLX2PR0htVyVmo3 X-Received: by 2002:a50:9319:0:b0:567:698b:1d1 with SMTP id m25-20020a509319000000b00567698b01d1mr2772022eda.42.1710080121804; Sun, 10 Mar 2024 07:15:21 -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 m19-20020a056402431300b0056840dc5c54si1207823edc.267.2024.03.10.07.15.21; Sun, 10 Mar 2024 07:15:21 -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=uzOEl5NP; 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 EC63368CD6D; Sun, 10 Mar 2024 16:15:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2027.outbound.protection.outlook.com [40.92.66.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF9668ADCB for ; Sun, 10 Mar 2024 16:15:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KZ6xy4iSCCy+MjgZrqibbOp1i9NVp3dEUalP+Sr73AgLjF7d8RyjAjEfWP13KRxjj2xcjcCiiJaG/krBkun6/Kk7KYvFJFPgllbNRwN9ezyjSDdfKCnKCG0lxC7jQoa11MEIs8fLY1yR8h2fW7rUuXhvnFDcnhDbwMlzPdF5kXdw60by11K/T4/zLTgsOfPF13dVFuqDmj8OU7xWBzcG7ESfyPLN5gh4BY/BYqhKIqVlXNCOcUG/EJxYugIqXedfqosMupedI1AClMkP+fvmX73Yh3+UpcGNWOT0S6WLsgghbR8Zil+g+TzU98xbH+9mFxIfTDSrJ0ZfxDxbcgdxBg== 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=NHQFh/URKRt8KcBAOIpz9ZTJcDVoMMXmkL3fKbHz0I0=; b=I0KjC+vqs4kpw6d2T6wj66BoH8035vYB+76zwr2pp5gQPdemKvJ1LH+Fgg6BafRJOzdZpfYM3FAg3c9wyEI+7oJCTs6kgGj1K9fyvpfL8YtvqY+r2YWDrGYt+kuM7X9vL+AlS2Vw3IuNYTaYBL5WeYShbbqKHXzXfrPo6Ug2Hn+qVndnfji5IvLBfetnydy9uA8BqY1aneYn2pXo9KE0GtWZ/8VnazwG9mlEolYQOjZ2iXsNmsHrcwj1M4PJDcaxXAbzbh7flnqDnxygOB07kskv3NZn1qRugof4pLWmV9FhkBsBAWaQt2JphL5S/kRBFJ/qRGF/UjpXxlUET+jCUA== 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=NHQFh/URKRt8KcBAOIpz9ZTJcDVoMMXmkL3fKbHz0I0=; b=uzOEl5NPz9Y6607gs1e27QcyMdAYPbdzltm+c2SsAWwF9mlEBejxLuLizzrREKMdzkkBymNdoZikMgUALq8fXvGnvt5IDM1dsJ97zpAXD84DWDk/CGgxdyGnLFQb36cwjXyBSWiX8ZqODsm1ivpnGR2ChLsj0YPRT+TjHzPCCmn9mqkbWswmPYfFO61Tk9Hh9Vf/k/fTUPdFZPR22PySgOCJEhDrSU1xKR/cHra5yRNqiEnO0USl57MA4+Rf8wjPQ+nTtlyLxS7WhAdRefxJSD6Hx6Chc+N5ZLBLuIwyQ875N0TLbce6aai+bktU20hnxtAesm8N1TsJkVA9YXkCeQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0089.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.34; Sun, 10 Mar 2024 14:15:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.031; Sun, 10 Mar 2024 14:15:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2024 15:15:00 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [JS/pnbcFzDsfV0bQy66G1Brl7OJ0g+y12/YII7daAjc=] X-ClientProxiedBy: FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240310141504.440261-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0089:EE_ X-MS-Office365-Filtering-Correlation-Id: 76409655-21f7-4abf-5cd0-08dc410c7eff X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrycYYMiKOh26ty8tiVyH4gFb/PX7bGPVDm59lmmPqO9GJq3aLOjifhbfIsiGtj1+LFj0Usj3rX9pU6M+yCMShgahGgSPTaAH2KEMuyVOEEBXttG+LwEDijaok5YerYv9Dp6rSLacYCpoxpQ2Vb288h8fN5agvDPMEwC8Mup2zRRZuwWgSvQ6OJFD3xpWtZoYp4Prmu/YBQec3G8iGgsRI7XYYsT6OHn9UVnJlg96wkcf7QSok0XUmQiJlHrMRnfLeHMw5JTMZ2Zes5gK37i0o0OU1kT+MrEbOOxCFLebhrO9hjYo80WERkntPDYVHEbIRR+79howr5WBWl2UmUJg7NwpMX7m/EHDSMC4Oxd/3R5pbW9LGeFSdQ2yD/S9r8vVV7wVGSLyAmqjru7+xsY5zL4XYczhrYQQlDs02+jkVZ9dKZaL8Z3lv8dNYvMfmtg6FDytK+CGt5Vy0T/+EC1MOPBFhAtZEk2/RlCWzkAH475rqP34HsSdpaq7X1YC/u0Xiom3ypBHHsam8zP3wOnlTkTY+wMrnDkz0i8jDHAFgOiLgLcrV410yEXCUNmG86a+ItjWwyiMlnUYNMBkOtUDFKr67n2fQ05+Q4sMmh3P/w6VvktVP83WLDZyJ+/w76FkRi11gOiF0FiQkU1sihoEkHUavxrrHUqXQMW7S+gNUNPyHVMrBEHFOfx0WzynPz6woa0btS1BFwe3y9u8wqoywoVQR0S2Gmxw6SfmEeSUqW01/rtf+wPzUtYqKM7WUajiA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O0wMCAetKsTET8HkyMvjExJMMO/7Rq/8AmBRwHt8Zc9qmhAK9q39UB/dK+WaAKBUkdN5lKYENeQV3MTpXTpsXubyyBzVUS2nRcPku4ogqFtbTdccyPH1U3+j9wPCaPTA0rZKvk13wBNpDsvf//U1vGyZFeF4v2XfVCsoJ/3PmGayeH2j/tth5znN3JHtPLGn1MNdGRqZmM5eo1HA1fHlYJywyw41l5AA0boaxx6zzqG/xcy29ow/qVmJzMq6T4k/tkAAE7wvevczXTuYN1W5VgZUMSXbV5uF+eYNjOy8NmReO1g2o7i1r6YoZ6L/vgeXRt8jyTdl3nzKsQoyF3hTcqVtNEisyBlUefI6PfPXGvSviNhjkHb0dQ7GaZ3Pewa44mKIiQnz+s/ORhh5V2YsTE8rXOlbcdTFa2VOea+rexMCtdh1OP7t1WOZpSEUaalMjU+/UKEx9SbYhVa4nkJ4OTPj26NdnfY5EZZFY7+d4xX0H1ihmxkL9d3mGu3neJuqVKmbvfXEjJkS4JsfrqMx/ScsLsAdnKlc73J1I3EqeHo3teOm+qscGX91odAzY2U3DmDH2Xw6zzmb1c43CV27S7m5zEahoqZ2k1F49gE4jkW696AAbxBGfK0N60nRO2RA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 99CHiL6I74D7BO4m+fbVuzrZcODv0RReuT/LdYdLP5JnWutSV4erxhp6FrW9NHVeuI0YdgY1KzBDoGVX1mU0NO7BoInB/Lr3xbfMqqMiJlN7toxVOWK+ohcDKaklcTuYmW0D3ibQLv7vHtx7W2kNvH9WQaDscyVQCqkJLXIIj58HNIcWn7r0UXonaIHwIjxwOJus59M9sz2oZK0xn0MBtI4xsnfOgPTnCSevDvodC48zSUBlmTCBpNE88iUjiUoZAd9y1xyKeer82O+EAnOLsHtVZxgkJDwZqTBky2mzRyNl9SznRrNBNTF1XqbTG+V4F9Po+gBW8X5BCNkh9/Q0YNS0Er9yhJKKE+bJBqEEBdw+qgHgNeNY5v03a1LouxC6BL6u0r0AkvjLPYKj4OpTrCTBu9y8CHZNsQx4MHeOGhkmyMlEkQX7LETEl0ipKheyiccYr1rRdOW9e22e59qrCpcIvVSCEsB8APHmumokCqJlncbXMiEs8tTm/o5wvID+y2qVjugvq8Ma8g720cPbgThR3Pf7CrCmI54Fxh0HVgrp8oiC8qLwKzVetPRmYsVwroXNQEE6kleQ+yRUDbIO0GOopwtjC17zAy7o51BCwWRzjA2QobFGVoQhnQ5YuuiET6KoH6McXKtjxTvZRmWz5tcLzLVbm4Yn5df9tt0ApZCirjmWIZ1ItRApWNyrIp9GWbb61ALTJWVtMKSCy9NKkmFUNWjK1D0/tGMJwulrM4W5i5/4mqod4MYlaz4JiNPa6zUFZ66Q+TGQXHHBQrG0un8Q0XYgzRiPHRNmufoXUstjW52QSAbnAqB/drPDGlkT93fKgrVvUgmU1VjgGoHBFTDrjEdDFUU2df/jJp1VeY9P9Rtb3mn2bDKmdwAWchAtRkqFhiPxc7dR56RjvST02XCjkj1okVSwwn2aBPjsVicXo4WDvJhhCPeFYjgj5ZMPtGbNww5kynudWuSCE9eVXDKjf8hThocnpLwZMmYoGoBH1BuOJUSIRQIeEnK8wlrkOqMOi7E9cvMbagDcCSs+tUlEDvNjJ+pMwsh8xmTAypQVslt9pCmz68XmYoSmO0AhXjPD5QUU6jlNLf87LARx/gai+T3X+ID/rk703ENI6BeiKWLwMVpLFZ9JmcxxbXYtBjd1tOxA1UgmDzHr4o0e7lUA5zXH0J3q/IPttnuFhJr7ZZtTipq0NH5KiMPL+ykceZGxz58wP41fh61yvTnycUwCL0MDRI1p6Snx/h6pKS9dixTWjXfy7bDeKNCrBPvcMW7VbCHYAA79Gg5IMLl+4Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76409655-21f7-4abf-5cd0-08dc410c7eff X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2024 14:15:10.8205 (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: AM8P250MB0089 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/tiff: Avoid duplicating strings 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: DqtOQK6sUuxR Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 4c7460cf41..afa1289e27 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2028,7 +2028,8 @@ again: av_log(avctx, AV_LOG_WARNING, "Type of GeoTIFF key %d is wrong\n", s->geotags[i].key); continue; } - ret = av_dict_set(&p->metadata, keyname, s->geotags[i].val, 0); + ret = av_dict_set(&p->metadata, keyname, s->geotags[i].val, AV_DICT_DONT_STRDUP_VAL); + s->geotags[i].val = NULL; if (ret<0) { av_log(avctx, AV_LOG_ERROR, "Writing metadata with key '%s' failed\n", keyname); return ret;