From patchwork Mon Jan 24 20:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15694iov; Mon, 24 Jan 2022 12:11:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXLCSkF/YnkehqSZpNHGcASL2vil0kmhh4zZ+dQAcUe/xO31z+e6ix5TQE3rfwn0dTRnCj X-Received: by 2002:a17:906:4fcc:: with SMTP id i12mr1487382ejw.530.1643055076496; Mon, 24 Jan 2022 12:11:16 -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 m17si9973534edd.153.2022.01.24.12.11.16; Mon, 24 Jan 2022 12:11:16 -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=uwisaieE; 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 1DC6468B1CE; Mon, 24 Jan 2022 22:10:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D3268B176 for ; Mon, 24 Jan 2022 22:10:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jB0bdhp6+KcREnFTvtl/ZNm+pChXXrpVnMbJJboAko8y3QGR67OHPfVgcz4wG6sJvh9UZW0gkvNNfLjnk717whfjJtWgVbdpojdDsHZ9psSOf7/toXXMIyGNJGj/CoBxmzXceGoGL6faUBbxrAaLl+yrzoGEYiKzFFWXsr3BWHuwdEXUqrNM1dVY/Q+DIoJlpnUdXElGyj5zpAd9D5NhbQz952yhUqWNY/Kkj4m4hm3EgtxSTsq84FW3dTGY6aOEhVRZvV1uBTTUnKtQ4y5NBWarUk7T2XT5KuJpDWmkYKBMPRYzomfDfc8PGdVDzF6bvN335a5vHeHEanZ3oqck/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=iwVqcopzta+MBufmVE2wfrli50EY/KHMpF7a+g/Y6ZQ=; b=RyiVos+YWswGwyNw7KJnj+i8vokvrRFx4xTTyOwR9KatskkPCiKe4sQmXWbqvZdtN4GG1zOEy/0iZAt6ditBFLZTjgBrjxBgoRkOS3QNaiJLjwLnfWPJ/HRZrBMuaAnlUoRpKq6Cnzm5zzn/i7Iz5vN9/2uqHranRbTZwGYaISuwxNClaULsoy3K2exud4/IeKVElQqjVBjmS131y/etJhG2PoGeOtEbW0HFPy+LCY5EcGcLhh4jA/39//XqfgXmZuGsprMfGZrUJpuOzbWjIV6ZvPWA8YiJx5SmMRZV1cZoSdgMVAlDP/lMhQ3lsJARFs90Zr6Upqh1j907o0ALTA== 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=iwVqcopzta+MBufmVE2wfrli50EY/KHMpF7a+g/Y6ZQ=; b=uwisaieENMl2/QZ1mNCqzbG4E9aDSuW/FjGgGehDWF7pP6GHs7EXcQqGa5RYP8t+gyLLHDzo75X/2PaJqAwvkwhmvMmy9TkWsoppKG9CQ4cKkUtg8uRujT/By6Y1H4WO2T4AkfYGyOE1br5eB7s+KcwH8HnoUUatodJVBjFZesI2IIXryQynHnNKWj8c5UW0iYjmntSGtodEoq3ouIDkGMXEcyp8Q6zNizgiqD2GXPhCCRet14Z0hjw1sIpU4zw9Cg418BWfhXUzqfvad6QDlg9I+EjDZYUulEIgQ4yk5cLkzBKSp3QjLE4noD3H4FJd0mkoERETIEL4LZZq3TEuKw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:09:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 20:09:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [poyFz3sIxtGtZEDtEZp6gJI6hg3vDGUd] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 106277cb-4657-404c-d8f9-08d9df757f0e X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6JYmUit0kKq8a/fYwTKMrAIu+0Xb2h4OxkiYrmyJkG5Fd0b1VvOlCmVUgGBLYZcYbwei+4bG54xbVwE6kV3ylbyfEmNJwoOgsGKmzuV/s4Od5AF1iFteuEKeg7CZWZlBcVIUJKRIbIn0lKL1jHIEmqWAJMqjnBANYU9cxLMY+z6S5NY0n0AgJ96b9zJOQImspYPGeHged6Hb2nv6mntMEydLV5/9rXp2l5HVLi1F8Gc+WPxm2sIW/mjPLjz//IfiA5ryRmJL0kMPaHIMK0GHUysO3c9tZh7ywM4Rn5o8I+M6TZ2P7zIl5M5cw7yn0CJBnU+TocWR3QnUWk2wOmEZsyG5wpyNyb/EkrDm/DAXJNQaN3i3Ef9qVxTxS1kb2p8+2o2tMNTuLjbcdkShoCzwXTrw725jZbhVoQCbE9N8Op+9PST/nq9je/tW7wFI+3IteuTcxJUriwxjrlWrX7T2esZMme89nH9mOzSWA+4lCCBQnHNSpjG/mw5sNsVhHQLINqWk+x9ZNhN9ZwcVVbdbwXi+W/+ehF+9B0XWZJdVOJx8KykaBc6Hub+JOvLenTIS9neAAJoUT9QpYzzjeVPxew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qk9zKmA1N8VCS92ftpZgou7/8NUAGMqH/WE7Z3s7yffB0oVswrx/Emsxhqkp/PGuWf7Xy6KAyYZNZPQGqCBRj0UDmSeqHkoKuO5bS2UiKaOEqxOU1DFY6pnwGTNUDAxyE87xuTujOXHw+qIt7nS0bVJCS9+29WEQJ3xGcv51pPKcVleNNC3U23fFrEgqGFX82ezJoGJxEzAqwBixayfs5+sC1iRklhaYbcrv+I9MsRAldiEObEhqG+YLvXaMh54fiolJnFyavpr1E3euq2gPmKnLVbIc+wRTixt8LnlZT73pZ1qY46K7xsH3caw6cYiFCMjsCRY1TYwoVoK/iV1OiNJF5mVGXgEoy36H427B1j2CXOrvubbVG9RpygbjFuHTbsfLk/eACs9xUTvSYYak/x22gYoG2u67Tdgc5vylkEZlknN6kCLDFfFtUy+sMBeRVHGB+8eSRyu0SNispoQPcYZPTbQIKtBC6O6OdJgjG9sqaRbB/QS3kKOWMdDdERrSd4OeZvW+elTEE2nGP3YeUKqlUOIBdBeLr+Lr4P+Pu07dGEISGqHdILqgJEpX9OUdMw0tHjKB2MNziy2hnXn22FJmvez/QrlOvOV4GE+p3D8gQtjfGIVaWMowV5IENECZRw2Ozz3iKnxhvtRtuNTV9wT35j0BwzhcKw498SXuAH8jcI4Mck3bTvuYWtQNmZcwdJKksEnJmPLwTXxisyc9JL1CkHE4Ytg4myxuvZl4zoOUyoeDtjGkOPfkcLt2+DXBIKjOIWcUFFzppft7orgssepnTknz0MR9mJXkyJoY5lVa9+Lr2tNFl+dQ/SHxbQ9KrKgsIKcgOSXE6poE4WMfvlU94PdxvEwbmXxYqQ7efyKZZVyUwgARuTX08Iyb/f75EqemB0FnndMexgwVrAFYYVFbfmgC9W8ApK1DpQWd9lrqDNb1wkhbao/WoEDYARTNsuclVqp4L3BGEtottmLBKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 106277cb-4657-404c-d8f9-08d9df757f0e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:09:58.7201 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 10/18] lavc/h264_parse: stop including h264dec.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fGMA0CNzDFWB From: Anton Khirnov It is unnecessary and only files that are parts of the decoder (as opposed to standalone code called by the decoder) are allowed to include h264dec.h --- libavcodec/h264_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 1c1d1c04b0..97ddf0e437 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -20,9 +20,11 @@ #include "get_bits.h" #include "golomb.h" #include "h264.h" -#include "h264dec.h" +#include "h264pred.h" #include "h264_parse.h" #include "h264_ps.h" +#include "h2645_parse.h" +#include "mpegutils.h" int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos,