From patchwork Wed Jan 24 19:52:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1511597pzf; Wed, 24 Jan 2024 12:06:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBYcTpeK4s/Mpokz++h8UqtSUKxCcegMqe2ojMpvldPOigANnQ/AqwNjFgcFvRCSBjQN+P X-Received: by 2002:a17:907:874b:b0:a28:716d:8db9 with SMTP id qo11-20020a170907874b00b00a28716d8db9mr1242014ejc.21.1706126764729; Wed, 24 Jan 2024 12:06:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y11-20020a17090668cb00b00a274f339b7bsi189337ejr.664.2024.01.24.12.06.04; Wed, 24 Jan 2024 12:06:04 -0800 (PST) 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=sRNOoPJQ; 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 CA18668D13B; Wed, 24 Jan 2024 22:05:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2030.outbound.protection.outlook.com [40.92.59.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C3E468D128 for ; Wed, 24 Jan 2024 22:05:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpSTOsoClfCI2iMLUEV/o+LyNayamj9S+Qn+rijO7dmQdJjdON/fBt8pPmzf4faiKGcSgYnbBD4T7k86yEYsaTZZLd03c8ELKJxCDD75wlJdEMBr6cqlQZcrP29pkyqBunKEfV1smLXX8k0NE+JdvtrYwblLrVCEzzugco2dCjQznJ0U0bQShb7VYxvYaZDUIe/wvtPTOieh38lbmCGIusOXXPJkEWVCNynkhQHsxjxdtYPkioOgTUDeSlBoJ3/HrFXHfoLMmrF+A9/5Q43Thxf81XEiiGSfTzqhWWos2NRXLQCBvgCrf/YBjEf9dT6Q0/NFIyfUduXnTO4UKbJb5w== 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=k0P8t4HUQNDBvEvWlvt9lGJS00ELdJr22IfxygN5qio=; b=j4UAGM9hEs7nxnDu1hbyLCULcYU8b+EBTuS3SXD12Uv3G+jEuE9J5sO0+2lXexB6lnrKtYCRhtiYM/HqZBf09JKXpsCFYZUdMIXlKy9U784uFXjex/BdXcXejJMSDmzYY+2/t8Jl/ue2B0mQtJ+JMcQWAbU3O1Tn8LvTUyAd+K9DJgsHPA177GtmQzEK7OuxZgp4uvfWw9OU1wDIdsydoL+RZMyI7/Jqnh9EbSSM4/pcV5rfgMg1fyV31Tqd6nUqgHRJvqe4YXC/nGSTecDMaRy8lZ7++gWmkjZdxum/rsUC7ZJBy/sQBcP5tZR3mD0e5sif95Cvax6hxDyo+wOU9w== 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=k0P8t4HUQNDBvEvWlvt9lGJS00ELdJr22IfxygN5qio=; b=sRNOoPJQNw4YmSFeR/d8xrQndHcmE1rO+PO9dOwlo7X5QR6eNCH1nMw2qziFaJxjpC2rL1KZT09n7kBQJjlpIiHp7Y0uQ+HPcE92BXjdIgDMEOb68d6EcQs8lo6RNSAmLjpIIPC8PcJ8yE0yG9C9EaD4+bwn4WImAn2iJ/SVP5ESpjiOSr21q9e2HC83DHrjwauoiWrdDWEa2AEIbyBtoN2YQznnFKHom11bjnx2R7LKk+c0LcQGpIHvaQMPCPkZX41zjs33lUJVm3AEz2k2Pt+ZfpchUv649A028PVsIYubGhzLdrZjM7WJpk+Va9pkdB1REWS3MAHRABjl4LCJfw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0064.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Wed, 24 Jan 2024 19:51:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 19:51:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 20:52:38 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cY66AHHzn87J4KpixWXvAcS7pr5oz4MTeizmSkNnIkI=] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240124195239.558681-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0064:EE_ X-MS-Office365-Filtering-Correlation-Id: 83398704-9548-4d13-c74d-08dc1d15dc1e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: se6JngSRa7sbtZw7gkCTQMpc2lG2qfaqqGJbHb9Vqf2VpuIH03Qk08D6ORQzUjFVZeT5UP7s9h2p4CtcnFVlwckBb4UwmiO1OzdHNrAfYrpqQ5XPOoDy9D6jVgvbCiYshG7xhsow9xdZwawAgEgR5tHrst5JvtlJba2ULVDHGlXMiO56GOjPiX83fIEdmnMocj5rt5K1W2DvAuzYlLAtYNph1FjJc4RXvAGDRjbVc3z0t79zU7aAGY497x6pcRyfWY4DjXSP2SyIDO9pi/ydZcDaYGb7ObSOlN9ZsUM/zBQd4WEv2TPtCtNUSu3PtAnktDPxrxnEie9juXwAE+leLgMFpw1fsq+UIb8CAz0CQz0btuiSi7B9AGwsbYzZCj664rRbkahuu2kz9Sgj9WXnN10MxFpC5cmGSk1RdmMWX+/Wcn4qkVmUBQwoXp/69myvVd+PJujXydOv8gwV8jE3XyZVd+PpAJjKGyuQYQ+UKjgf95PgsOzONJlrzrghykVRscY7b0M/d/l5hwBYq98lzhtzU53w0qP+xx8D0C3RS7GCzF2GdJRgLBi127JJRHemrEwT8B4tz3uX2dvryPB647WmI/2+g6AI7eGWH+Q2RrJJjWur1bdSaUKldtE6ySwH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EbHltMhBOoFVTZlAvSPqb18aV4ZlOkJcavJNbhfhCzDGha5AabJ61JV8JH4X4TSMcBoqql+n/H/CweIh5tML+3BCPQ+kFcrdpuZAAq6x9PUaZR5LiwV3ovpM9BmgEEWv48GiB/9WHhUYD59RfoyW9nSipXWXEaYlKSoEihjoVPu5n3YAPICc43aYN3ZZW18krHnNkaOTjdwPsYuBKzL1kw945cDxDAvknExASzv5e6GKzYrms8UuA6MQXWEYSA1ZTfGyasLjPtckWocUmmku7GuIo9nFvsKORf2lIIC7/uoG8Kv6jNdzPLGDXrxBB7/hi/wHSruOJuLUZc9SnX5qYRBuATzdGzNwBTm6fvj873Rkas6ZwgRucbUfILbseH7WVoXTIVbsyD+hbFH9/JHE97th/DyG5AmbTZfA7VBdxPdsGe8gzDh5uJS7LqkDi8chEtyqmS0Emxedh2pAc0YcrImUeX/Hr1b4TRCLFsS4iXuA+eRmLpc5417Llb6H+UXVSAXmZdlkz+drodLEVLJ7lceudKhNPako6CpTjWU96TwUgP6HzuZdJ9eQ45c4jqpgj/FpM8JNruan9KgfFaKTCEE/nfqIHwIw4m+3EiEYIL2TSmll7X7ZemlT6YM/wfQ3vzHSntBP/PQyLSwuznCsFrBtrhZHH9KtaicPxWnJ9xQzi/kZhMt0LF6tHNMEDjyP2ZrS2+pN6nxeSffgptHILl9eKkTAvNiA75HnkRNZ4NkIPnLF1Soc/7ivKexobGjbe2B/VtYqCG6s0aG5U6yxOxSfzN/LiYKlzPA+zPaeZnrvN+2J95g/xnh9TpCjYlznqaWCZkt9hTKgtoMqEDvAWkjotYw4CQKFBfziVcX0GkgovYkXOTvx65Ux4g/d2+S1wu9n6n8K8ZgwdSOjj6PCK2K1ExF9o5eZrOLw6Vl8qTXmiL4ByxSltI3lnoXLl02j/OL7/cbAgrIYGK58R9AetMuMPW5ZU503oCz/9I48d02zJKD5HtH7zuYqV2zW8q0yauvl9zRJo5VCUrr/2/JEiXrFUlJfhYXCwQlaIlLHBpowYsdE/gIoMcnGTbfTkBcx6nmDZwiM4ZvKrJGBoykz9aHNYXMPMb4BPu6XLpBY7LtbNxm/EUFX7TWyYfDcOkFA67g5LOqmZlhSZSPam2l9aSWA7XP00Q0gTTjGWg0bUXum//RPrOtuOvoUMQNdjOKITIie9ujeHekTA/BefuSfcKogDsfmk+s2SshCbJADXtLHPYRaOx89lpXKu0rK8q52 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83398704-9548-4d13-c74d-08dc1d15dc1e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 19:51:30.6292 (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: DU2P250MB0064 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/hap: Avoid unnecessary opt.h inclusion 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: bKCtjdMdRR/W It presumably exists because HapContext contains an AVClass*. Yet AVClass is actually defined in log.h and even this inclusion can be avoided by struct AVClass*. This avoids opt.h inclusions in hap.c and hapdec.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/hap.h | 5 ++--- libavcodec/hapqa_extract_bsf.c | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/hap.h b/libavcodec/hap.h index a888b58fd7..1de6d45428 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -23,10 +23,9 @@ #ifndef AVCODEC_HAP_H #define AVCODEC_HAP_H +#include #include -#include "libavutil/opt.h" - #include "bytestream.h" #include "texturedsp.h" @@ -59,7 +58,7 @@ typedef struct HapChunk { } HapChunk; typedef struct HapContext { - AVClass *class; + const struct AVClass *class; GetByteContext gbc; diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_bsf.c index 0d9b40aaa6..eac9eafe42 100644 --- a/libavcodec/hapqa_extract_bsf.c +++ b/libavcodec/hapqa_extract_bsf.c @@ -30,6 +30,8 @@ #include "bytestream.h" #include "hap.h" +#include "libavutil/opt.h" + typedef struct HapqaExtractContext { const AVClass *class; int texture;/* index of the texture to keep (0 for rgb or 1 for alpha) */