From patchwork Wed Aug 2 10:58:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp572043pzb; Wed, 2 Aug 2023 04:13:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFYCvpHYX1JeOfOx30aAXB7rHW/+pzb/atA5uXCeRHhKqu4uex3W/ehb8Yz9pTM5jSmwYhz X-Received: by 2002:a17:906:1c5:b0:982:45ca:ac06 with SMTP id 5-20020a17090601c500b0098245caac06mr5315912ejj.60.1690974816232; Wed, 02 Aug 2023 04:13:36 -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 q22-20020a17090622d600b00992d262fb29si10617111eja.992.2023.08.02.04.13.35; Wed, 02 Aug 2023 04:13:36 -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=ZgfdO+XT; 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 D791E68C15F; Wed, 2 Aug 2023 14:13:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2082.outbound.protection.outlook.com [40.92.75.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CE2768BDDE for ; Wed, 2 Aug 2023 14:13:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PEkWNXNV+YHZIQHQl+VLz/GIRWXUrtCcmKtv57YGrl84423Cu/yzscNLSWnCpYdW7arAKmWLZOtF4KvCNKrdDfoSW1Em+ZFEg80csiHvxy/OqxVaiEZXI2JvCv2kOQQEJ57sqlVwaxupybCh44lFIh9YccoKwrrbO7iZTwjqZVXbr1Ho38eVjxvOTKNWQ3ad+kLx0To/aUrLwNOyrt5Cog9p9QmJJ7PntejE9WBI0y3hiucSzWLfNXQATsUymEYoRU+Ox59BALL9GHiTGn7w9bIBb3lJeoOpjknhfytQBUxgk9BBgvYOQgDDJ5UuxBD7mzpgmnLZpPFqJkHzc8UU+g== 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=YFRq7MnXlRG3qVeDwGVZZORp+dTJJegUkvxrphhliwk=; b=ZhAzggm6Wd3WmoYMISn6eh6ebSwRNmmdYRSLQf+vHqyhiAQbzPnqKQDYqQpfRXTU58W+Lki+DohWL6npD52TvV1c54LI3cApYctvqoAytJIqtPcG6a4LoSTj9yggSD3jRwocYN83tiRGE9yk5h6h+b4SQbEVREPrDKmdpqDAFVSPyqONT7LR6ETG5qatm0EKmWSlIyKrzk3XeHhZ2JoqsvBLMC6RSwWnNCAHAmMqhQSBXifaW35zlTpTScdMZL1l6GT8ZgKLZZZG+QBcMtex0eQjKol8/fWQZt6aiQHbq+aegJSfcrmo685KI8dFjuAkH17jQ7cvMKqXQxDXKaXWoA== 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=YFRq7MnXlRG3qVeDwGVZZORp+dTJJegUkvxrphhliwk=; b=ZgfdO+XTepwgLSE7qb/j1wFCZ2RIWb1rRNkJJIYKYPzElmdRHHabqj79GzIg52+oTXhhjmve440aFEWGJEMIKbsb+96a1I3hdR/8xNCYig12dqqgUOcHSIhMdwwWFurN6dFc0s8S9OlRxrgp+kfCBCl2feEKxAlC6qS0WN8fRs3wzma31oYk5LEB7tkOHoS6b4NmPcHW0xlVqKTzjPN4bM2e9sp0ELv8832wkOzMbA6/1lIiEgDJTZ0KrD+bKkkEf7nt5aA3TTImYUCX0DW9i/OLCAdnZHBbwKloNYeTASX4y2bLPVPBKfKrOy2snodvL1JT5j6qqAeT1btiEY1m7Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0159.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:322::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 10:57:49 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 10:57:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 12:58:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [zrqTUG9LXRrW3QqW26MjMkv0a9eZaoznNBJDLuzV8sw=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230802105837.274253-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0159:EE_ X-MS-Office365-Filtering-Correlation-Id: ac7f7408-577c-4149-3bec-08db93474f7a X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKweTUlmISQeL3+BBxlmv2aXEbxvsydIpnNeUl0rqKylCWfzxagIn3T3Dj1odwWSQxkv5DRGuEeTAvwQgPEgw8h2mBk+APUEcJCJcOjDsMqvCvlm5mLiz1Nzk2BvdA7LoMw79IXDO5Xj8hg6KoiOpYYxXK+kl7CFGuapFoknmmG86TWYotaCEczJjsBcu2r7WU56dwLgCT+92fDfFGwOKs81h3FmevzIeAE6d3phDd36jNPHRj34MxDiaOePDG3vBfyIfQobr7GhbrI3FkxsKeN4mJKt3Zt7U+tY5EsY2XciHiYPGR5e7/znngCDIeuMM75+n7zCbWcnylaknq44LFwEeSTr3/ga6avN/GoGrxlX5DCPHsqP3qCP3XtYaKVAHrznT7gZ/6NlOmW+wM+AR/KyoPUEdiyhUjgf9LHuUdb6hrXj9mvcN+1/PdAARl9eCXEy45jCYp0jUC345O2jO1AOs1gSVHqUexOiHfjRUKcyffmgp+XmgSa2zqe7U5Ax6RaydZM9nMiLqOyFh8rPWhRo0Kgsrx8K2X+pkPPX12G78M6oOYLICzVEJjbWjgdIHv46H+QHji6e9xH9m/HbUJpB2qHidGbOK5x3DvVP/NDYYBF/xqWFQwvKm0noQ35iS19zFuVEHdhLcyjAMcFQsSnHiS/RTeJuuCTLCcEMhhSKNb2YjJ6iP6Yd+0aXKnSp9o2w5Mi1EXOrksRUihzO1fGtEJB8rmZUuPE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fMJWguF4q0pWRmDqpaiXEjZ1ULNqcfjWLlNqY/HbCdK8KoHlVyEqpMy/aBHTGbZa33t2f9eM+CfGm7PiIYzELjsZQ/8wKpw3bGQoPa1hNAHiBADYtVs4GHDEMVApnTzDEeGgWgTM+64wukuzhjPepjAKVYaozBnOAWTunsFLjRqt758CAo5mGdewqVcB0zC8dM6YoZoV7D4qlRaegtHjQoNzP2fMovjHkgD59PyafNRcU9HLBYK1R3icYKrnCUFPud0eGEU9Ip0aJmw3f0ghQce/SY7RdfB24OFE9vHFAwkN7d0dvB79E99zx+K4ZoWLwP1uwl0B3gjBi64PJO+M/8nQ3cL97B1fM98nccxFODrM7YM6Sfygp0Htm2vkPCkKdvolNdYpLGh18KPYIwJ3MCUNRQN5m5dbglyvhCecjWDXOd87m+nwZlAsJmEZaBH40lSe6njcsIFg5i6wjKRfIH9vYGAXxVUoHO8EI4PSfTpLhKKTjVysG3Ogpv/jque2G9PVCV5QpEXtBgxclhHjFEE+2mw68VOoUXrVKmmZ4m0MxLFT9OhvaE0htcY+4/Z1RnNe+0ngzj6+7a4BlpSdero9TmgPVwYKbT9Rq/GP9xP7AqHFdgl6aTqaMKKBqoga X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UtHxZdZi0BFmb7LP2sgmD+AXjpdiK7ZntNB0X9kakf8z5Hbl4D8Zo0BxzFWrjlEnNMWaXwT64cWOLJma8SglRwtxXAN6uTBN9Zd2cWeLDT3EYz6Ry3PyPuXpnNtwxuclpRGWabA6ML/wG5zytMMFxqtJsczlE47n6I4cGZRqNjZvJnaUs00Fb8BnJL5Jb2kfy9osGQd1pxwxRJdH5mOz983EEsHIN3YK2wYvSBEchf6VlniKJKYh31v6yhWgmMRXpbs+jJWgOXTgv0QEoC4tnG8XB5ua+R1kjql1q5MEVdRPBevADjYldU7rp/5IOyQhNW77kv/qJxo7lJSwCBE2pja+QaHwF6LjR0UhEoec3I/snjr+JIEEGSol/tGwKUJzAnQ9VeYWDI5jfH9Mgz/F2BGvqhsjAORLjs7LbEqFN0MsXf5iUWspvkDDywnipRXi/HHouPDl0YoemuEwtyNNAF4lCmCs1RomaRoyUdQ/zg3aDdJUrwIAFfVIcamrbX1b933yNKZ8ygDmwUcxHtZeetlKe4BjhVcY5x7BxtQ2Ye3N14eqHq0BwG1y7DD8kwOJZcJnA2wH1HI523nyZF2+hzQLQMA07kKwjC4WgguRwCxhc4ojrRgjFm32u/cBrm/Y/UUje8PdB3fgDJFfZjEetgz1Ko5YuEHKukInwR1JiYUX06fuPDIDBhOtnP8ifk+7n2+u4ylvbQo5uL7lOmeaUu11tSzk/ZEsvf9D0QdNsvEhpsR5uMjGmzYAymD58nkaBSRvBUgecTY8tIbtf51uDrJfrq/bsEaFGeP+q1hdhOeVXOk17N6TaBWpwqkH71LSWcheP3GlIfM7uZmoqPxN+V3HHTQivP/kPa/qcEtr9U8laMW+mLba4XtzSDa8d7cEQYacH1s+dm1mAoK6/jgpcHCsAgCYEvflxywUFGsKkp8sPeVQ7kKhdnTHcm5Bkh09kt27cOPT/FUGCRaHfbo31aObw7XPFCkYVk4w2WmxjBUT/j6kSEt5DLzE4sGdaNMGJutKadKwcIEfQP47iJtHKwmiQ94LYJEcYA/f5aeJjSzNO/khivEyeCiwCIRhVJoiOB1+RAS/xRxFX5Z0V+tzqi7J5HacWdFHfwVhzqhJF5poZcUdmNYxPfzxdAtG2iMiHOxo8sGlEM6zXFE31QbYIAhpM/ONMZ7EgQv/n93+9m5wvrfJLKEPMse43aMPD3REAfYJj33ryVkxCk1eyeWALhmQmY76LeFQ330irOdwoqzDr7d+2wbiVWC+Y6c45i2D X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac7f7408-577c-4149-3bec-08db93474f7a X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 10:57:49.0827 (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: AM8P250MB0159 Subject: [FFmpeg-devel] [PATCH 12/15] avformat/internal: Use forward declaration for AVCodecDescriptor 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: hi/ghFCmejn+ This avoids including lavc/codec_desc.h everywhere and thereby forces users to include it directly instead of lazily and potentially unknowingly relying on indirect inclusions. Also add the proper inclusion to libavformat/demux.c, one of the two files that actually use the new field. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.c | 1 + libavformat/internal.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 1ef297d5e7..b218f64574 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -36,6 +36,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/bsf.h" +#include "libavcodec/codec_desc.h" #include "libavcodec/internal.h" #include "libavcodec/packet_internal.h" #include "libavcodec/raw.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index 9fc980601f..594afd731d 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -23,7 +23,6 @@ #include -#include "libavcodec/codec_desc.h" #include "libavcodec/packet_internal.h" #include "avformat.h" @@ -410,7 +409,7 @@ typedef struct FFStream { int64_t first_dts; int64_t cur_dts; - const AVCodecDescriptor *codec_desc; + const struct AVCodecDescriptor *codec_desc; } FFStream; static av_always_inline FFStream *ffstream(AVStream *st)