From patchwork Mon Jul 17 14:36:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp5420748pzb; Mon, 17 Jul 2023 07:35:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPPgVJLN8hq7v5zHXE1+TFOyisNRzwmPXNhfdExz6Ug4zfw+0hSMApdc1R1ZIBth+lrAEO X-Received: by 2002:a05:6512:2384:b0:4f8:7781:9870 with SMTP id c4-20020a056512238400b004f877819870mr9897745lfv.60.1689604545595; Mon, 17 Jul 2023 07:35:45 -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 bf20-20020a0564021a5400b0051878e08975si13527789edb.441.2023.07.17.07.35.45; Mon, 17 Jul 2023 07:35:45 -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=BBrQYkjC; 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 12D3268C59B; Mon, 17 Jul 2023 17:35:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2107.outbound.protection.outlook.com [40.92.90.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 408B46804DE for ; Mon, 17 Jul 2023 17:35:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G3A2/yubhrF5D44/9UibxYB2ay4VNFdanSi6dohWatLk0KycXnvUp6U7EW4nw2VuboREYR5AkLX0q2EuXEGhrS9yRfZNJJZZNC2U5vPEOO5m07govs98yMP71vvGuaqLGroaoFghlMRzhZsKVzYYERcbyDw/bbAR7XIaD/dIloeuG+jU9GEBcx+lww6G7k3Ir0LtcBIJrYGP8GzzrlTvFqbvC8mL0VC+9kFSyWZdtpKw0HaVN64nmbP7sX2uV9CRNN6gn7oEpKRBf4jnR+gXhTrSRGoPGoX2Fx/M/9OUB5KrNq8wJ9ocL7JcGy3N67OBq5nWLx+9jPVtPR1S47jUfA== 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=2y+UrMNvbJLaXiTh5DEM9xOR1VP8qu7YdbxwsSiAB/A=; b=R5k/tdg8RpV1kCWMGpyI9phNI4s0XBK76qmfLR7qBWNipLxy4nRRny5WR/TFSbKyo9n5y7ySr0X5UCTaUKSIeefKegjWze4WMz7nf22Mc0lNLlEC54Qydp1vGZ++gpEotQKyGVmpxE4eMr0KWd0XmiheVq+VT+XLoR4DsHV4AR2bY3iq1lVXU08rHcmmU6aEQJ/DHeXq2AP7Zyef7zxODpwnlX85b88QN5JdifzFPeaVYL87zwCkM6GQ1FU2ZWS72gXmShytHdFIGsgpRdVnOPGW1934JW94PSH1+1aen3r0oMBuvdyOGKbe7EMyfv4WL15PgT7oGnf57kx+yO0UEg== 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=2y+UrMNvbJLaXiTh5DEM9xOR1VP8qu7YdbxwsSiAB/A=; b=BBrQYkjCN8GrCWGvdIUxWf61BMEp+OFVQ/U/+lTMG/CWQZrdllxzmwP0kP9yesn9h8NMJ4RGeA1ZQNTrrAUatPjQA5OiyRhIDEerACGJtB/2M1gXQTEmt/x3Un43vH4KkqtdgZ/RGzUDeYeJDIIGmnyinGSFyLp8dxTSv3buKIjfauxKeU5BQ91lBJIh9KW1WubA0C++PXoQgEvH6kNWRWn5Gdu+XeO9KivC70B1nJ9FNcu2QHe3p1A47Bl5Wj3Db0dL3rDbucHUCdkegxfAN8YhcYoh5l+WxA4CBb6V8LIxvIkvA43ZCfH8DEm+QuorVBHnGU7ta/tkYzoYIBaeZg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0156.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:372::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Mon, 17 Jul 2023 14:35:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Mon, 17 Jul 2023 14:35:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jul 2023 16:36:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [noTH5d97kYAWmuHr6X34/WZ1qqrFdTd4] X-ClientProxiedBy: ZR0P278CA0033.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230717143637.600213-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0156:EE_ X-MS-Office365-Filtering-Correlation-Id: c118504c-46a8-4ac0-21cf-08db86d31416 X-MS-Exchange-SLBlob-MailProps: CLk2x5OX5VZwo4mpOER2ryTBMBuaKJPZcydpzsErA3wwADN82iiVUjiOszbIYoJxL2HDkYyRIXO9e6U+aKM4HIMh0KjhquPAz/Onk3X7aVxBq1+N8HKWmYHU7PON3ICdI7HoYMLCyHVNmShuD5X7ATgACSCDb1WyYO2nsEvEQI6Qcdh6pQXskfVglvzlAFNarYGl3CL1ibHIJuoMcxLn+wlQ4KSeDcJHRRJWTD3fdBtRo7NB0jWBb560wIDirTgunBU0v0t3Aejl8Vi7Wy+DoC8gK3DnZACLj1rdYe2RJqgRDc6+3QwtQqNhhiOvQfn0LlFBL0FHfkB3vq87AE+IJpsUdri92c6n6msT/YP8MA96+d5OS5Sz7MfcTad3sg135F1XlboZP8WhXUfhSZeg78KhoBFIAqpFe03568VI0zw8eS5KGmYToe5cYFA+i6T12DEGS3ekzEPF6gIx0hE9HdAxI8Cz3xLmCE/5e3txCFj+kVK8lY6Z/vXHlDUmjRXt+UR8sPRUUMhG2J97UKNIN5W5QM4U3Ua0YLDO9ycoSBy442iqyxpxtYuU5pbgJcQgmht5wuNgIp1Dqhi5VCH2HJnqB/CQq7hgZnuf7pES3nQe0z+gMeO/QgSjZzLWQrOsFV0LmuKY9m0By5QzGOEXhRhUjGKNDJ4GIHeHZlEHOQe4fk9E+G130B8nytBuAgaV2UuH4oqHfT5grXGVxLOLMQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DwnnGWhVOEaBZtdWikszDRCqjf+KkBBxbSukjS4syX9mSagt5IMkNTldlhKiAdShplSzSs4tWewsceWGiZeCrZ6Ghq/1wwc2ohCi5oNbu1NiUpCp96dbK8wpT7Z0uzP5SZXNDMTx4klysqKtBTN3mmjgkDqV8gpoPmEoRfhiDhyFngIDOWweUEW+3o2QBmjq2XRw5HsRkVOrhhk56n2ji7vrrbr7K/KA+NUukgha0fQZR327LIeV1T+j91jQciSODL0Exm2ESpylbV3bQCL/UQocehYw57jdCYMa7/sMkrwwPhGT1Pfwmz5N7eOdNKCYUNj/JbYnODWVBikWeLW2LIRTwCJtIUV8bnWrDkm+iwPNSLVLUzFoVjJoNQyuJIpgsVACPVIlhTE2qy+f3Q/ny0RZidFTkAKfVYsGXfPVikOQDVn3Rybk+Wi8i6K3ZUJILh/9xk5Lrhuk8a4noWR7315v4Im6WsAvVbRcupOeIFbHHGeKKVutyeMW3UNVFqWKIqdIYTUOZ0aK7sOa+zspZ8Sbqn8HV3pbWfArN+04no7QmQHGP7c2EUuN3Ipi4atbyoJZIoWBmQTyAGDsSMHhE7AKrfv38OqurXngb+2raL0Y71fXiWyNJylRRzG1ONwi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eiYKqnGvKG397qy7q/KZT3Wg4eVXfBrLPm/F6las33wTmKVV6WlZXVNC8WsPyxx31MiZfnSaCTSB1arqT8aQIJHN7BMdzr3viLQM+dHsNF3l8mBELTb/E21fObigdDCaEldB5zuAXumqiL/RX8Hd0mexK0Y0sBaRuKWZybvlNX6Pj/KfzeasJpgJ2Pe4+Iq8BVBm42w33Dked9FD2cXn4Qlhj6MpSacdGXY8ehY0beRvDFwtN2do8Hf6VxIO0OjH0/OzEJX1+iZpEwJCTAkedfFFcMWE8YaOPedRsW3E8agTCjOs2PXq8Z78R/WN2IPv/SfJHmMuskUcmcfAJwLF1QjlpVuXQO2T3bwySzCpvWMwgrNeF9K2KBgG76rVkYNrrnXa1Y3eVakApHoJaThRCCwDeq0rqJg/5h0U6LsmqvtBA1Q1NAZqMVpwu/t2OFlMrSeZBHhxuCs5Neg0MV57LyQ6/6guoBpnRkrlfhvOikzwebhmMTVQEV4lTrXYoHJs40629hYwMqKgBV1dxl9G0PpGp7cfgChAOYWw7mDIvG3YMvdJ4iIgTQds3cp6DbQAb7y6tpquZbAMfaRZoa5n0/ja2RN5xgrxL3n2ZGQeszpLjqUDmgHLKu1exuKNcPkUfpDIFVC/lxW2VuNIvtk4fGZfQaqg2yX0ovMMfpHbVolQPRykzLV8uz1TbtCy5uAzxmQUtvzJciOcTFJjhDAhZOd1s4oyIYYC2RoYYUn+L8oA0sS8/8krvTBsEKxRyCVt6R/dyLUD5KIaULQhOIcjvBFFciwhiHnPyeIBL0Jzb43lBUtRKJMpvp0yBzIyS4ZQkBx3wZq4dtUi7Tnb4Z6y87VPbVaRJykf0LGn/3EGjGgJaedxl7MWORfYli6s3TQKAL6481B+etj1vZSNzcqRAP5ysNn1CNXVBBJv89A0ZhPe3fzpc+KBOffYauVdP03bHCZ6q+tzTFYeJMubZa5zmG0xgSQBR2AGuR1aC+MPGaQbHcIRpCb7dQwq/LHYgMOu/D76mob07dazN49sO5tEAiMunjLKbWEWiTgDFOJxjRJk85y9/m1637fGmvOXLZMtxt/BdrPBuucBXGVR2rSG5lcGnP7LliATQmS3fXMhGsr1872uqPUKKKvQA/Q5zHFDSFQwJANksiTRqHk5o81dCZT1B+N8mGWftonOvisxs/dz1d86g+MCshppnHwG7/uU/6vqVQmkUgZXCseAIB0usU78gOYZPOv8lVIoyyv5Vruyzt7G8HAUUhAPaL8lU+E/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c118504c-46a8-4ac0-21cf-08db86d31416 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2023 14:35:33.9379 (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: AS8P250MB0156 Subject: [FFmpeg-devel] [PATCH] avcodec/vvc_mp4toannexb_bsf: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KrW/eWP3FIgd A BSF should never include avcodec.h at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc_mp4toannexb_bsf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/vvc_mp4toannexb_bsf.c b/libavcodec/vvc_mp4toannexb_bsf.c index 9e606cdc27..25c3726918 100644 --- a/libavcodec/vvc_mp4toannexb_bsf.c +++ b/libavcodec/vvc_mp4toannexb_bsf.c @@ -24,14 +24,12 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" #include "bytestream.h" +#include "defs.h" #include "vvc.h" -#include "libavcodec/get_bits.h" - #define MIN_VVCC_LENGTH 23 typedef struct VVCBSFContext {