Message ID | AS8P250MB074449363B44E2629DCE0D508F252@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | f032f1326b5b10a94ed7d53397234aff738d01c8 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp742374pzb; Sun, 10 Mar 2024 07:15:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUo/xgCx2csm36uqIbDDLTbHdhEZ7JNLCL0qnzySIvWFrQIJ+oAPmFMe41hns/3aREEeTi2ih2vmXheav7IO4RIRuMAz3LDtyvVOQ== X-Google-Smtp-Source: AGHT+IGlkmZNVtSMScQkUDvmep57W8NPPHCb5hfb9qX1aDF0dQwj8TASYNNp+jE97HsWJQbDnDK0 X-Received: by 2002:a17:907:970a:b0:a46:22fc:74d3 with SMTP id jg10-20020a170907970a00b00a4622fc74d3mr927491ejc.72.1710080156868; Sun, 10 Mar 2024 07:15:56 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr3-20020a170906a98300b00a46275b967dsi92189ejb.869.2024.03.10.07.15.56; Sun, 10 Mar 2024 07:15:56 -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=YtyVm9BU; 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 672AB68CE33; Sun, 10 Mar 2024 16:15:37 +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-ve1eur01olkn2047.outbound.protection.outlook.com [40.92.66.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A45B768CE3D for <ffmpeg-devel@ffmpeg.org>; Sun, 10 Mar 2024 16:15:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GSjNaKZjpZt9Tij0HxkeCR6S+DqcoYrhLev2sHucAim7KkBcVXYI7Re63XxwXEqE9scdWCby7k9wBVqwhojmQhFEaN7g8n1qNYzSnC4yX5eJH9OZ5eu66G46Cec/H+R3b/nk4QfGFNZMXOm/N9x8gs333Rrm9AWMCPw6wHSy6cld4j43nmEcF91VObQH4UzMbT92w1azymJny9ksiN5tjkn7pCNPSqj5ThIV7QBuTJczcdNNIdqL2QhgtI/NB4gG3RrWzoXCcVYMfi0UENsqdQSJZgYxUngduMg63LdzUnG6AYIko0ZUydbnnl1UErpXyEFZo7BeDS7iXaP46zY7YQ== 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=IpMo+7a9sEgSwku6ZcaW0iaaL1hMsiePeeJyYUdNBOk=; b=D/IogUNDZYONjh2dQxfKuRQ311h03+EPW4JMxMVro+iQJL1fS5V+J7k6C+GM1L3rBxE9iDr6YM85OlzAEVSCCFSnYdnBE0Txf3dZd9w7/noOyJNVclUNQ6pBR8vxBJmZCd4HgAECXfcSNUs6bR89O+pmZHvxfZwCmJozawT/gXgpjp+wFSdc5bEVnvLDAlBVRyY4eB8EpbaDC0agKTZf8a0uUDPVCXQ1Wlle54NQfUV09yJndXn1sEST7bRDLPWGUj2nJMHH+XJ+sziP0nAViPpM9+kHrbMdBXvvF7bdHfuUK/FD7hTrNDcm3YiPehyOYTtgq2R3PZDOyl+sZFPwLA== 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=IpMo+7a9sEgSwku6ZcaW0iaaL1hMsiePeeJyYUdNBOk=; b=YtyVm9BUvp3HTkPIyAEkYe3Q9i0HIFzQvWLpR2m11CZkZQQv8IYf+A4nMzUNQUWLODSWsrmeB2ZssEE64i79vpGPsDNNchwEM+mLCjCu8fM7bXp0e3vLsYQedx5raIHOFqtO5saAxHN34su8xRVIhoEVzlsKpft3uaqWKVZl07Seeak54C4WsvLdbwwq/fArBf9dpl6TGArOZnV76lCuwHcWHQbQ0SIV2oWTwWLGc71MVaGWrBatwYA4oh54vjYjFMlDTjOf6MoE+Hfncy5UXfyO4z73vd7TbHQ5A4NznHexyxsZHs/y+IPFToUlcazJ/8j2tM7FyS4jBlma/Mgm8A== 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:22 +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:22 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2024 15:15:04 +0100 Message-ID: <AS8P250MB074449363B44E2629DCE0D508F252@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB0744663E0FB85672850B8CD38F252@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB0744663E0FB85672850B8CD38F252@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [tpR4wlU2UFfiT7GbbX7W6kKE7ue1hIvy+qksjLMTizA=] 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-5-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: 62c6a725-a4ba-478d-6958-08dc410c85a9 X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO+l2vvFO1ePCYDuTB0dbhYvCtdubrVj0iKHtGP/0vwH0P7HBZfAGngEhwm0WEVZH+vMziOlfO28sbM4bDjv3PndnMB1piYRp2FkHRcF2ifxVP+rU2nrRvwMtDUFH0+1XLWTc4GENLml51DJmI0HkeHtauYWbSfwBO6McUILG1bbHBPsMAVXPeJPChSOtMfgJF0fM8Q/lAfW3x3AURm6ovKgcEHiEm09v5Brfg1Dd5VffZQQ1ckndx/I0M3Ig9q9ArhPdqg8sBqeJogpeEuwxr7WRsw2Q2mx4dQJwasVyQae8cQ0hvlKiy+OmUr7cY2JAUczFaheYscJBXsAlbyOxzPWwTuy7sQLMyiExW021MUnr6TEJB6TK6ukrYwmObYOBQX92NX+/RlNlBpmvzkSNWnuD0Rjy+v+HZJaxMmPaHj+10CEL7pz+HCRCqSHLkbJot7ltVC4OPpIrp71IzMfGYVk254o/BASCVh3VpjT2DcfsItyuiaJkQJVH4zSCaYDkzvmvVH5qV5lFkY/oe9g45tp69PVJBV98eVV7PkYf8jrLwmVdRnaP37UermXSs1NClpqwDNwR2K6KTBc2OSDf5E8z7vN55/lcrbnnMv79DMHPgbU5YW1QGFcSBryjv7jsNvOr6lxoUNtaf5XELh872eMnsb9WQYM+YZxTzrSDgVyKQtgMTP1uuk/eNLhM1PMa96NblmnxDF2tA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uhnegV6AG22wuqmrWbM/a2rnRK+PFUc1o1qcbtqrqL3h+1gbkSl1wkoOn33gljHjWQv//OezqWmy9c+FjR1/ooQIH3h2d7sydm139ZJrhSNOBcBpUEA3eg5yui0MH2Lj4141DsRztT09ldiE82nYtlZ9opi52larMYrPTF24bQ41vCVMjyVa4FI/QPenndAE5iv4WNZqBEYmMVwvlF+ZkjRQ72R49LApM/3gI7bhG/eMTcDL9PwcoqXbhzkDXpg1UcGooyN4M0PfV0WUqilo3aJRyoQ0H1ASrpG4PqchsqthIGpev7NDaPIGYndyMFmx6GTpcEUSK2nxxY7g3COBUmzRkQNhMNzvF/bNp9jin+9WDJUrCuMOjEbBu5yVY5oeyh8cK9m0i1Jq4YB3MFeU+RMTmzET0C1C63WZ4t4CYn80YlINah9bFkKSwP69yNo3LAVNa3Cd2HanZN13K2XBHq+J4qDb5kr2QZQRy26cS5U3KsPiEQyIME01+JFNqzhJ8bNUDEMj2/bT57DqNXrWOMnvbZn79WnN7t4o8VdrhRPvoHHEBOOvlnOFd2CNsZuzxOUmxNmA5z/dISZASaYKCd2HhJ317Jr46ASLM0qxF/RTT6oWhefCyNFTAJnAB3oMDsryv2RkOLTOBSv8/JYQiMbA19p3HP+Fv+GZYetqDE76glJhO2sECVzw/c6YJxR0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bwoht+XckbGc589wDfSWr+KDVGewdXdtFeJ1XTdHUVttl8mrCmLw4IoWPqgU3m1uhI1ZqtaS5GC8KUf7FgDgkvkvQbej+vL4DezCQXKUddUvWqn/hsbN7andlWEa5SQQn+7JcsQBWYZDo6XiTEd4kDeHOhidFNos9AX+j/hipostPU+YlrElkrsmche/qeLrJluz17ihWus5FcrWVOEKNRlLGu4PqvEbXJR0vdCRZzrEeLu5+gNov6UVjaVMQQ/n2TVy5gsOaNGFZuoaGmCpaW4pmyDyETSpVwOzQ1a3Bn0YEPVno0ozPJIok+xsqSkF1ujVH7GAeguJ156uN8/veaW135cAgRvxbNO6wC34aCViqdbH3RC5ZWXopOwubacauxsqsQ1XEcGGuL1AQz7R5MpEw5cJ7qO0OJfMsmS3w+IfMlYrzuimRo5z18yO8IUdLQh3tk+MD2TW+vv4d3bc3f18VjoKmobXneTJdsyAZBsQ5MpVhv7Z+hrEO5aYBij5yKL7YGlHk/Ug7d1kv0GLtL64cHqZc/VjAbHcUvRKAz/UMQ68ggvBJjR+u1K79yOvfNdb7rzCwEr4r/zZDeJVFUpV0IdLY2NSmWEWcG9H/uhfoPUzSSNQf1Vme5FPBXFqFBerBnmHPwRuUyKTpHFqQ4D/DItecEPVPaGMLePFnYQbUSpXQZPXe++zYUtDBib63Ykk+akOjF/BxoOcJSEtcRqdiij9mn0B7ExqRoOkQfq2XxnZt592jHzGkq0Lu/aCKIzzaS5idJdTNlff6jnL69TZYxNw1k5jUVLGC/zXhQkd11JnezqFcJjKlL2/3fMVQnGXqD28s1FtcFNSo5wXTok3X6OtZ5V4UVIYtvPNDPcKRInic9taTIMexkRaafVJivyWjoivkWgP9+PERnUmvcL02ZKsJjNK9D/IHGeqTKNYG6gy/jF0bMU4WpqDwAPpHVj8E6bMVgklCksKkZ2u0jNES5tGZ5qHmVaQJvKFhBua5KmjIz068NKZVVlmn+LDAQW0nofVJ/uBZBoY35xymwRo3xnbLCd/Tje+CMhxcjwe/nwQpbu3rTK8q+nTrJ28bkLIA+cFWtDmXoDiUxrG1Cb7U4bRY+xof/5GW/3+CIJLh1+YgkapaQi/Xp5VpIg37ZXbTPAIWiKev76mX2EbPF12hgjh86QclSG6XwLHOwh0Y3X3kIkvoJFUTlWnEw8icCLcbLxz4JuU04kkHhbJOqc4MXn8LYLDa+RAXEjzIbxWoORK7HJowBMBiapxRs3Bl29Oct+hfbkTq452q2u8jw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62c6a725-a4ba-478d-6958-08dc410c85a9 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:21.9482 (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 6/6] avcodec/tiff_data: Remove incorrect GeoTIFF entries X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: EKRJg9t/s1E8 |
Series |
[FFmpeg-devel,1/6] avcodec/tiff: Fix handling of av_strdup() failures
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/tiff_data.h b/libavcodec/tiff_data.h index 9ed46d31af..1742ccf60f 100644 --- a/libavcodec/tiff_data.h +++ b/libavcodec/tiff_data.h @@ -804,13 +804,9 @@ static const TiffGeoTagKeyName tiff_proj_cs_type_codes[] = { {26771, "PCS_NAD27_Illinois_East"}, {26772, "PCS_NAD27_Illinois_West"}, {26773, "PCS_NAD27_Indiana_East"}, - {26774, "PCS_NAD27_BLM_14N_feet"}, {26774, "PCS_NAD27_Indiana_West"}, - {26775, "PCS_NAD27_BLM_15N_feet"}, {26775, "PCS_NAD27_Iowa_North"}, - {26776, "PCS_NAD27_BLM_16N_feet"}, {26776, "PCS_NAD27_Iowa_South"}, - {26777, "PCS_NAD27_BLM_17N_feet"}, {26777, "PCS_NAD27_Kansas_North"}, {26778, "PCS_NAD27_Kansas_South"}, {26779, "PCS_NAD27_Kentucky_North"},
They are incorrect according to [1]. They also share keys with valid entries, so that it is unspecified which entry bsearch returns in this case. Fix this by removing the incorrect values. [1]: https://www.earthdata.nasa.gov/s3fs-public/imported/19-008r4.pdf Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/tiff_data.h | 4 ---- 1 file changed, 4 deletions(-)