From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D465948FF9 for ; Wed, 31 Jan 2024 09:31:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A2CA68D155; Wed, 31 Jan 2024 11:31:23 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2107.outbound.protection.outlook.com [40.92.74.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DEF68D14A for ; Wed, 31 Jan 2024 11:31:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOInH6hLnYAXHwG+qKgu6uoT4wRaTqwfXQkWk3EjKOeF+fK9t3cfqSYh/eiIP3NCuLI2RwerEdWefYwI+ig/HjlCGu75obJxdPJqmSI4WiPa2tq3dV7yEx6pvGwgU9GrFp77fi68B+tcPRoXHAfnsJzTI5lOdoeM/Rz1s0s52gSsSyX4Qq8746XEZOM5tV2JKN+S+R6vyoW87H3Ne+ogUwtxdbiAg8GwAOMfp1DK2EzkQIg9KZK8ju2gj14Mk70vcel5vedJAhA9Wz6XoCfDxw782JP0LbDGqBzRzcN3KOPRbPi6YryqlBrd+40zi9m4E6iZw36aFcrMmOWKcENGjw== 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=fI1lsoeHQjf227mTjh9IF6KUzZdNzkscvmoOpXItSbs=; b=QF1RVazXOYeobL2ZceMx6bk9gGyYKPTllPsCnq1bff1Nfyp5NnBzXiT/w/PLzpsmV1hfKDWoC/9QLfN9Obx8B73tF4y9KzmxNFf+a2Zz07PfdA5Auols7NCr2ep6OWf8iCAoAFU7PxT04FoRS5zFHr4j0jzqlvnFV5Wiqr8tjQDjQGhL5KV85j/pnEztsyb3ntBo6Lh134DTHcTQlvJf64gOcenQIa/UzHDri8PS4LoFEd9pkoxMNxz+wR+Xc4cyQDaE1LhHzlYDUdF9+3+or0W7EpUtKJ2XNOBg4bmpRi+Dj70suganqSfN8mRtjGdGTvqxItK1G5w+BwvHy0uT6A== 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=fI1lsoeHQjf227mTjh9IF6KUzZdNzkscvmoOpXItSbs=; b=eEwqFOLNcCsr4vyqVVwXeDInlC6ko6Bmt3YFxHFuGon1CpDaS6vgwO8W+GK5+X3dAGmQ6+LbhH7gAniUHR03DN+PWX5wJAVbyfPx1IS5ZY50e3wKEzQ/T1Kz7jTqNAMNc0YE9Q/80ThAs42Z28n7bxiBFXNW8knKIKo0fIhJfP1HS7IEqFXscN1KUxwkovpM257uujK8BeZZEzw14CXPy0t9CT8TEgaQt/u22AwOYpJ31FmuYoKuO74zoOQ7blftfHsdVSK2iQGNveH/Hsrksb/s/CeK0CloNJoeCbCwzq8dOSQhgnV8C4gz52589+HT7iwf9WCJvO4R9aJR862XKQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0414.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Wed, 31 Jan 2024 09:31:11 +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, 31 Jan 2024 09:31:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 10:32:56 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Ik+AuXo/lbDbNQK9NJ9VmLez4vp35F1nWz16THaFuXs=] X-ClientProxiedBy: FR0P281CA0235.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240131093256.749308-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0414:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f8f6dfb-3c66-429e-8e68-08dc223f5cbb X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp0HDrO/Vxd+Mt+RGIvgEHJAngQuvbWmKGRYbkm5p5kSwjGXBmIl8BR4OJLXSkEv4aJN+SH79WJ0qWgQ8EhJyfL3aI40dOF3BK4Szpar8I4KOILP6GBNtyfy7m0o9tqU4n1thc6zsMMUe5DDvlZ3O1onhX/IlNf8WnpmoGTcQJhJnn5fBQo//Clchksj7VGNN/Z1EJqxK6cq2wnqkPJlmwArro7hCxyhFtxl6NWtgL65qmaoGrk8mzd3cHaN0+LC8Z6Be31Q2gOTcowLJwumZ2CGz4WR8uLrTzJb5jIpb2o4TcM0Ofh4hbuDBUiUqKT8aRIpX2qAP1GLcCRyDKa1fLwqj8s9G0qAheW28zIGjYCYZBc0UXGYiN0A+CPx6X+qpaZVbof9SloZHjqMltrw/PVsuOpi3LVbsVRqmqml5ukNCL+iKG5hOWDVzZOT4gStg/0uKAeXsf8T6HJ7UWa/E6+Vv8v8SCh9G0N8vtpYwoLcAlQoVGEaOIF/nMq5mqP2vsLrNxlVxmMLDDl0nBkrwOBTi8bW92k65B+sWJW+if6pno91qG2ezfX89u1/HwUPzl+UXR+ABaoJZSjm98DRRiQsDuRue45hoB6ZydlqLC5vblRh6Bqt5NEq5phEMVGn/mw6ni9BPrMk5Bh1HRw5eg8QedgL4/0zM7SouuP8UkPphTf5G9of7zQ70pT6IVlb5r7TovuPn6CoR7tVsokLp0NXzpkN5wW6rtbUraMrSf6pmppDbaWGxcpJbAU5ItRLws= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8wvlnV3YkiijhjIz6XTd4tJHxaGgQyS0q1ISaVKqogv3GgpBhXWnBUBtZ6dFxp0dEAyqbTRq+IjwJtOwJky6ZGqxESunYqQzrw+A9ZCWSfg25I4PSWTbBfMb8WkTnxWs5KBSoLugzlUinQM/4y+hbzjduhl8wpOCWKP1JjBEmxX/DHgQ6/xzVCb6MosSJHOy7wVXRM8iRTLS1cXVqvOwi8mXD7kFTv8nr2Ta8AUmAV3tCMJicxtWZCvxDfosEPwCSFdl7s/UX91mHzf0j6zfoB1Gr7ZDtgqoUzkYSSOAG/TaVPT0vsjqWeGLkDgV4AcL6wQpfGufrNVP7HhbzjQvJp/J/mu+5MkIU5E607RDUb/jwXaTz/nR6IO+3iIP0kyYQB7Euns+yWWJuHmazGIqgnyIeHY4gPOenzjizqUkftyR37dU7WKOPqfnxLLaKKfJZaLWoXbcsCZvyz+mNBJdV1H4QuJWVX0lPQvFJPoUH3mYGZDqx/4Z9Wt0IvZbBZ0A/dEtDw+NsOmWRJSAOlIX8EFu2aMjNv5lw7mUw+2dS97ilxwUTB6Saz7sRuE6Ds56PdUQh12Oqbi3llMckdjPKiQzJmpp2SccnVYWVGXCMEhfHP2ytJOt1UpdCKKY3kjP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uNGDFiU2b35JL0naLR+SNoV9j50zKLEFTGysVqAhoxeKHyuP434B3ifn6ZYt?= =?us-ascii?Q?uM4P8hlAdj8N6DkZeJaderbygMQ5wcM4Z4HHLCBaAssQmcjgUtYPZithURb4?= =?us-ascii?Q?2g6Te7fvOHwnDGc/+IClkTrtw63iOZxtH/JLL9B91BF7V+tV5hfIWcXDNHcv?= =?us-ascii?Q?TX4UbsqqE5V0KhbEMHLA23RfJb/FFlvM3pr7tHNP2dtjcuY+58w1+YBh05nV?= =?us-ascii?Q?OXLFXI9RSaoSmuX+F+MrLRVM+FNEwa49zjMwmdQHn0bPd9AYEk8Ox/JuuY4V?= =?us-ascii?Q?8QRymfQYJOt23k+wKrk+fRfoy7bTOgEkDoimiAGlhTLOXSyHg3Lje8FXxj/X?= =?us-ascii?Q?dJuFdPcxCBcvxL534F+iR/s14WAxNbmACbMGdR2tbjWDpj0597nO/KeWocvS?= =?us-ascii?Q?JfbTmav+u8mQ4amqWCZXTQVqtS5q37kHBC0K7C9R7PqQGrBp70BMEcagrsXo?= =?us-ascii?Q?9nNFginZMgrN1J0VOeZ7KpukWC6xk3mv9UMuh/ITtPkOKJ8ccszuPafNtN4u?= =?us-ascii?Q?G5gpK3/eJckki4xVgMJ2sjJKcUPgpcQTkoSQW/a59qIPPkhV6hdxAdhT7qd5?= =?us-ascii?Q?vBLWfCzTLBOW/JJvtjQFQ+LMpPmN/sTcVIrtLsyw2+Il6unwiCsWu151imes?= =?us-ascii?Q?grOwBYPh74SBsG1zp3EyDjxeQxdJynFDK5bXvltTuYivWdLX72v1bDRcZZoZ?= =?us-ascii?Q?NTAWWma4XGiSCBn4wQFXK2sMUSdanFxt/ZVAXmxUZ9M9vpooWhmD6l1QTQIO?= =?us-ascii?Q?QzMQx0lWCw1bycyuOP7HW1mBmgJ994ASa/20OBzAvBP+1PtFpOSXLkywP0fE?= =?us-ascii?Q?9shYewrHQcYEbOl2cU/B6b6BKyrRqSN0/jTcim3NJwal4qkdt1FqFyN4T5FR?= =?us-ascii?Q?vA/+3k1yVv5jecIW3RJpKJPzFsuQx3JsLwiAXtzi+Y6ZX4J5BaCgSg8wRh2u?= =?us-ascii?Q?K8cWUmVZEwn0IOQaZoIP47UKOfeaa96qppe9hUhiWOWUePEAxQj6C7/77ThP?= =?us-ascii?Q?VNkDs7Xk2RiskjRynO81OrvGR6/pYvEo2ckmsOun+ZtgEBaEbwBnqKQteSCL?= =?us-ascii?Q?FJtDsZqli1zr3zJhHo+XLEmieA8zOJChmt+9zDcxVJX5Z+tIOLeYE2V/wXy6?= =?us-ascii?Q?JAwLtV8N1kbLkp/6zRztUSt5Rq74PAUnJV1uc5Tu1Ts2DXsShA2GMD73oyGF?= =?us-ascii?Q?nD1xILjEzSK3xNllvLL+E7Sy7U+8u9Iajhy7NlRbp4ygsiHBexcJVPQkfr4x?= =?us-ascii?Q?2BOYG8MCT/m2BiopwM58?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8f6dfb-3c66-429e-8e68-08dc223f5cbb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 09:31:11.5730 (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: AS4P250MB0414 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/iamf*: Improve included headers 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavformat/iamf.h | 2 +- libavformat/iamf_parse.h | 1 - libavformat/iamf_writer.c | 2 -- libavformat/iamf_writer.h | 3 +-- libavformat/iamfdec.c | 3 --- libavformat/iamfenc.c | 1 - 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libavformat/iamf.h b/libavformat/iamf.h index ce94cb5bc4..d88a24c435 100644 --- a/libavformat/iamf.h +++ b/libavformat/iamf.h @@ -22,13 +22,13 @@ #ifndef AVFORMAT_IAMF_H #define AVFORMAT_IAMF_H +#include #include #include "libavutil/channel_layout.h" #include "libavutil/iamf.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" -#include "avformat.h" #define MAX_IAMF_OBU_HEADER_SIZE (1 + 8 * 3) diff --git a/libavformat/iamf_parse.h b/libavformat/iamf_parse.h index f4f297ecd4..bb506486d7 100644 --- a/libavformat/iamf_parse.h +++ b/libavformat/iamf_parse.h @@ -24,7 +24,6 @@ #include -#include "libavutil/iamf.h" #include "avio.h" #include "iamf.h" diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 5850c53c8e..1a360dee2f 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -24,8 +24,6 @@ #include "libavutil/iamf.h" #include "libavutil/mem.h" #include "libavcodec/get_bits.h" -#include "libavcodec/flac.h" -#include "libavcodec/mpeg4audio.h" #include "libavcodec/put_bits.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/iamf_writer.h b/libavformat/iamf_writer.h index 93354670b8..24f1c14769 100644 --- a/libavformat/iamf_writer.h +++ b/libavformat/iamf_writer.h @@ -22,9 +22,8 @@ #ifndef AVFORMAT_IAMF_WRITER_H #define AVFORMAT_IAMF_WRITER_H -#include +#include -#include "libavutil/common.h" #include "avformat.h" #include "avio.h" #include "iamf.h" diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c index 3b8d2ff358..99622f697b 100644 --- a/libavformat/iamfdec.c +++ b/libavformat/iamfdec.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "libavutil/avassert.h" #include "libavutil/iamf.h" #include "libavutil/intreadwrite.h" @@ -28,7 +26,6 @@ #include "libavcodec/mathops.h" #include "avformat.h" #include "avio_internal.h" -#include "demux.h" #include "iamf.h" #include "iamf_parse.h" #include "internal.h" diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c index e1003d5495..b588a507bb 100644 --- a/libavformat/iamfenc.c +++ b/libavformat/iamfenc.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/iamf.h" -#include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" #include "avformat.h" #include "avio_internal.h" -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".