From patchwork Sun Mar 10 14:15:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp742237pzb; Sun, 10 Mar 2024 07:15:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUxBd+X6Zltr2JQb6A1mEACwSpVV29eg1rgio1s18ZUsy5tHtqrUkTGUETuOYEFQDtUpsMUct+B8iBr1hJ0L6l+ZkUUuA7ePDqCDw== X-Google-Smtp-Source: AGHT+IHnt7c50LS6wnBt9914hUHLsQ4s2pj5ruE+FieQ5iQJAwfQBasshpvJFKXizfpJkZuFEPFU X-Received: by 2002:a50:a45b:0:b0:568:3067:5191 with SMTP id v27-20020a50a45b000000b0056830675191mr2495841edb.38.1710080138725; Sun, 10 Mar 2024 07:15:38 -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 cz18-20020a0564021cb200b005682aab56e8si1572006edb.415.2024.03.10.07.15.38; Sun, 10 Mar 2024 07:15:38 -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=BTU31DEl; 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 0A55A68CC33; Sun, 10 Mar 2024 16:15:31 +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 3849B68CE21 for ; Sun, 10 Mar 2024 16:15:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ue1x6y54Q6wr/DW1LmpiYaf4Gxw+ZA+DrRR4QzVEsj5HpfY6lsu0x4gWS2zsfnJgN566qglsto92ZIMnFuhQjZ3bw0mHX8KRPxSRqhxvjPZXTHbqPZE52qrzyktswcm+nOURfLtB88b4PU/dRUayfge4aMHzr8iPxalF8x6GRiAXVBZbqXkqT86axDjNpKEYZ/9sev7bcjNM0F0ge6D/RXiUXpSZcIUi3MTEWtrcVwXCZcrYLslOkOZ1DkVU/R6HYPogdUGyErHOQgh3QNr+IKB7VhI8sZcfGUAP2KhD9SQRMHC1tl1s0IG8fd2d/nM426Ejl+3BEx323uyxfF2qKA== 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=BLQlMNK/FYMzDXAE4ZLZSgJ1TrwePv1yMHp5tUL1oLo=; b=WsgVBCJyXnJBQGWR0TK8yKcXbMfdCUNg6IEYLBWWXiJo8sYoctiQEP+fw2dhWw2kInXrqhlMXK1ISAEZHRIsFs23zsh5OTopiqe4LI84B8NYiDqlE2gCOZgB23iFM9psCIwfXSN1nkiJ5p2RYpGDjZG0CBCXBlRqGj1K2pUTtOMXq1cRgg21RsTwvr1Km4zolIAC0aShuqn35jEtT15vnke4UQO2fFFSvQiBHWX8rJKcma0lo5tQZFmXhQmV+5ZMwaIhgLys6nt89D74+bEpGUJ7J6vHLeI2u0Adv07DQQqA4S4inZ7AQGFn2SmJ+RsHfVe9x4VnUNW6eucW6zDoWQ== 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=BLQlMNK/FYMzDXAE4ZLZSgJ1TrwePv1yMHp5tUL1oLo=; b=BTU31DEleggIGuE6rzBNQ2FZ6tdZiHrJpOG4yjK/nBLXsg8FZ+16iVZSu4FleH0uG4RkZVKFz48mkgP/hHHEBQIIeIioCM41h1xMLCzpMtMYJdZ5x2lzoQWyTx692G30zXBn0VxRnLJjVVaHbfvWNib5QB8TpCpc1AhW987oW+Mprg6nf2ilHyurFCjEDa68/QKyRqoMyVKJ9Lj7E3bX+3frIZrtVL6fnSAa32ukE+nLc/kQkxGUR2+I4iQZm7UIVWvr5Xlv8kdgxwziyuloLcq+OFKxFbA6WH4IvdNpjp9i4VJ4VyDS4KM/QUS4zoDSM+Dmp2QLWPg67sVKuwWHZw== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2024 15:15:02 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [326qc3zF+NVIy2VmrGNmewxwHfvN4SDnfQJmylL87aw=] 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-3-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: e048a5cd-cf6f-4186-d09e-08dc410c8431 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDeTSW5Y8+cEPfAZQXqQEI0KW1i14nJRS+VAADKnlW57DQnukTuQ4DPwCA280Nf8/2ZZaDKoa8BGMyoH0KsUjTVyKmKPTcF+gunhkT81g/EOF5lDi1gdq1tsyKN1QEVa0kikhZNX/a3IMOZLteqIAKJnk8o6QrjbldeAVqWIaDL6HfrexQzF1b2ZHnEOHwgqXnK6qYMN89k0gM+09ZnUK9j611xbdDFFebh25D7kV8mDCSS+YJ7Nl6ZKg4RXRteqW5Mxt5i8g3qiNG4F9iRkdOGiPWjSX0Z8H+097KJHn7NhdOWCNKIjC6O4QGINct8JzjiyLtBnl2KQ5x530kM1B47JRTcLcMwZwYnUtA150wOReNE9PWIkh/9NclxSQcnlEsfD7asqpQJg/xYsQ9TEJpf7to3v9TjOe0O1kS7wQCLe59qzHzP4caWua+6VwomVlZ7TpIsiL/w8PmNP33iAFakb9eOWHt8D0jW/6D1gMmqAhEn7fBgXWpIsng7IVTb0KEgr8RLU9XlV71FMNkKcVA7YzVexd7Jp00bKriQl5hGr/9jDcsITws1a5+0ajN+DWDNY/ZkcD9isysMlg31+Pfv5nfue/qJ1pg8BXaTZHuZBylMfxP2ECQv704cX/Oodq1GYVBjVhyd+9pCEjOv5g87rdvT4vj2oX3L247Xr6ygBjR1HKj2SjE1MQzsZooHqXJbU4btCLt2jalLY4GOSqi6LQn++rG73sJ/y9JRXVk3QQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8YaAKSthUuDu1Wxmyg56sUMnemUZ5t5uH1b0iwujiqdZZWZSj/f7cJtb0eCRBJ09bqLpMa7dc4y92NmtUqF/jJd236SaaNrscH5eiDyhlUJx3TRwKBvo/II/V2b5gW6139nYf2UHAnvydUuuihtgP1LefKGE+8G74bm8eB1ShGdZDcfF5MEu6dFRzaagjpM0E4/RpQe2uZAnZXpbgbpI+mImLBkE/Is2d6hlbBWVHF55PY4032cwMNzKuV3UtFDXJ7+T08WaL/4YicawhQMlKx7yhe3AWFkSF8mVyWb8+8WSdp82pt8K/06ZpmSUiWJMFmZc/sLG6JbunsGXtEE2LBpkj0dqOGv3BCwl5z0tAQiQNboDiYI+AYyaoFDD7uJ0225fTMMWjQl0ui/txkbk11vDUel7NSZIwRamyPd8ga4BSCI1wsPDS/V7b0OEgVbihPkTvTSBSryiNIDKzLdqO6Fq0RdVfUju7s3t2ZIB10zwJMWCSaH24QkCSfvZVXWEcNMqkhj0wYBOzIWLipuSYCRhtg58Rhkp9UVhna77TI9QafH+HKTcAcjQ+8VH/PpufQzKPfUy/fziyndyPJa1ieaSvENr8SCiaJIlQqJfDLfv8I3J4Eq3sTuGZM9J5k0m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t+xSRgAoN9Z7TeJLJZkBGsL0ERthX+OpOe7qOvczNIikk4oy3HulXN19ZnxDvUXI/fZ8aHK/VlNGIdQiboX5ZIYN+y3kTH3l0HgLnPwXFjlFFulQHQqXVRvBC11sAFiJ22NZAe8eSpkVSvKLb8Srcl+WuahzEoHTNF80jqvX0gg2gSD1tpl2FPVv9cz3EoDiuXIo/mE7lp8RvNkrdaHW6CTh6R8g0YbbTSPkP+yI7TyyIITUf7QxaqonPG0MwE3ynV2EwIHv0dlmSDMtJrbOge0SL3IPZ4jkurcTnoTgq+w3M1qOcMEdnzv4uoL0VYEIc5TeeAb7KOHDRxSiCjDGu5cEaqIhEsp+z43M3gjNLCgYYEebNiBvQkDSe1Lphv4x3aAMKbOuJxJUIiJfvIHXUNp8K6F35LQRjHDaKq8vKYHIG0IdP9uQeVzxa6l3z4U6QkyDw+q6cLXR8rx41H6baMMgpgbC36jwLUkXUseea7EMsDCQvxuS4JU68VI6wF2LkzGLWTvXKZ11Vdw9AUR257cXHzXu3BlFR6I9uslnL3DRU6n9V7+fAZnkRv52i4G0qipvN1JYfp8M+vcVTOtRrRjhcqGeozEceLtlzT/nezVa9+zdaGiK7gisOOd+B11fkGlYqTAun3spK2ghyJnwI8ivXHq9OS7MLMkX9VW0vbISGmeJVWlmE++CfGHCkIcG1UN7NTRzUpeAqMSCUssBY38NQ3vmtxLppMLSXSS1sD7QfWbKYWBsTOgctPs0dr2gjpGRqhjt5GSO3CnYDHqet0pDYeVFD7qPdtL/Lsls+TEKZMLWdu94tjtdzAx8n+ubYvi98Q/JgVKaIrbM34J5WAqzvsQbSEQ3/qGyO+AMs0CoonjsJY/Ndxw0rbY5HPpMCc+ucBGSPcEeU0PLJ6WgBRVAHPWz91xntrQ+cR812BJEu6KsO2tjVzO6E5FEm29WnMTvXfJp5/ve3bAvvTBTXGKV/2ZLU4PErYCAl9Z3o6s9VtyuQhADtBmV/PuTMqjAxr2VInbIc7Pi+3lAMwDlUCSBimBwif5h48kTz0kuvNafioSmWqK55jC5um+C9DwpErh+B33Gdgx8qU7WmDBdq0j7vBnMrXYIbLXrGa/M805Vmk0NuzOpEhUgEiF57TQ7hHqOmwzwHiXsjm2fOv5qH8+lKAgBFtqzks/9YOBCmjW4lP8syuTfuMB+q+RGKzWCSEhp0yaak3ZEqcD3YYyDp8KEavc1vwPaU0QzUl1HRcTHY6XLPVgPshGCi1A2tpggpdly14e3GHKfIQIlQALepg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e048a5cd-cf6f-4186-d09e-08dc410c8431 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:19.4780 (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 4/6] avcodec/tiff: Improve inclusions 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: DaEsqpjhvlqv Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 1 - libavcodec/tiff.c | 1 + libavcodec/tiff.h | 3 --- libavcodec/tiffenc.c | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 43b36d0a8f..c9409eac6c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -52,7 +52,6 @@ #include "jpeglsdec.h" #include "profiles.h" #include "put_bits.h" -#include "tiff.h" #include "exif.h" #include "bytestream.h" #include "tiff_common.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 5d350f4e7e..15e5edd93b 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -48,6 +48,7 @@ #include "faxcompr.h" #include "lzw.h" #include "tiff.h" +#include "tiff_common.h" #include "tiff_data.h" #include "mjpegdec.h" #include "thread.h" diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index e67c59abad..2dd21dea52 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -30,9 +30,6 @@ #ifndef AVCODEC_TIFF_H #define AVCODEC_TIFF_H -#include -#include "tiff_common.h" - /** TIFF types in ascenting priority (last in the list is highest) */ enum TiffType { /** TIFF image based on the TIFF 6.0 or TIFF/EP (ISO 12234-2) specifications */ diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index dfe308ee17..7c3c03f1f3 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -30,7 +30,6 @@ #include #endif -#include "libavutil/imgutils.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -39,9 +38,9 @@ #include "codec_internal.h" #include "encode.h" #include "lzw.h" -#include "put_bits.h" #include "rle.h" #include "tiff.h" +#include "tiff_common.h" #include "version.h" #define TIFF_MAX_ENTRY 32