From patchwork Mon Jan 24 18:48: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: 33809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp577685ioh; Mon, 24 Jan 2022 10:48:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYNMYHcH2njSkDoriqBKMFhhVMTw/aNASqYasyLtHXqq0VDiAWLnn3XBGEoOv75fvsrRE6 X-Received: by 2002:a17:907:7faa:: with SMTP id qk42mr13382848ejc.742.1643050127398; Mon, 24 Jan 2022 10:48:47 -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 u9si2043275edx.431.2022.01.24.10.48.46; Mon, 24 Jan 2022 10:48:47 -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=Mratygje; 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 96EDE68B0A6; Mon, 24 Jan 2022 20:48:43 +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-oln040092069088.outbound.protection.outlook.com [40.92.69.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D952B68AE87 for ; Mon, 24 Jan 2022 20:48:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFT3zcsboEvyg4m2t/UaHA3jNPT2RGRC32QR+V0wDGJv1TE5syJPL/i4Qbjb2dUj24zS1R0bV+rp9ux4YjDple7Nxz8nrGbiepH6DPBeXmrcK3iNFhmtSyk8KtEGN7XbHuCvXL1JKJoS8Qmjk64voALMhA9gEAW9SgbtpD0YBYKYFNexlhhR0fUOW96cb96oMp7G1Y50NyaxbMxF9WC36V4x1Kfu7PnPoHY3SYzu+26z0LNUl7U9YvXiAbjm2o4R5TuGvzlBdG/FTrszCY/2jBbu7fPEbIlnakJQtzjFeP6rIKYFpM/5NatWYzjnepVNEORlSbpQDemiwduleTRIZQ== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=iccR5w3Pm6pLGcnvPNZgQumiiQDid1UtPkY+Rds4ZWR7gXQu4AY0pCrjSQA2dNUSX6TjtXT+C2C8yLG/R+qJpJ3PkG9iF/H27Kfk8F/kz2hgKp9aVqvKFxSDr6kIOkBCrFNIubRG5CIjegXolNw+cTcrU9RPoy6KJRXglC4PNqvUFQxdqwKP0OArR/cTvGVRUyyjP7nI8WkKCCcNP9C0TKgVOytxrOh82O+UTsmj3FuO4KTOj940TU86rH2NlRPsvvHqzi1szOIQzIPbJVk9JMoIrPncnACvx/S3VwV6ws6GM6B04hFSV6owJJAvwHKv5DP6e50iJUX60jRPMLK1PQ== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=MratygjeNI7/UKQYuNX4hIVxX13owfeNnumgpo6S4EaFDFV0OIv3lpSZiKQ3kuJqbvZaz/eVK8jAfooLzOA6U0BBF78m9fCmiU1DKCt7YxYNpOMlQFHEVHbqmQ6CQpWnQriqH1qALwM34p5Zm7w17/Na38NqtvwYd53D5tetKM/lxScmPl4c23524NpOAXrtMdzNXx1JF0ENsf0Ch77cJvMoqcPAST1rlL2dR0N0LgBhQbI9j/hH0Swa8gJP8eSDJTJp+ZyfnSrX2LdnQFwdmBXJ6f750T8O4vjTyQDl75UH16HWVpBiQuRzIWc2M5I4ONxQBX9gFpoqH+FK2SZmgw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0302MB2732.eurprd03.prod.outlook.com (2603:10a6:3:f0::9) 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 18:48:35 +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 18:48:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 19:48:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124170014.17189-1-anton@khirnov.net> References: <20220124170014.17189-1-anton@khirnov.net> X-TMN: [GphX08GO7E0w41GEjHAAnay9QF9azWQi] X-ClientProxiedBy: AM4PR0701CA0016.eurprd07.prod.outlook.com (2603:10a6:200:42::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124184827.584491-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a262ac5-5566-48f9-29a0-08d9df6a201d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxsfp6m0uSpQM1UXlX/DDSKukruyO7nI/DTU1xTTYpcZceHqIQO0YjEA2Z53rlxwxjyaa12mtN/t/CUAb0PJ+4gJBTzWZNdn8pTL5ZaBL4/JhtO/KHueoZhflKWoCyA7yhT1uzh6R/FAaUkr5qrUhsyPwAUkSPHavRnceQ4VmAH5DdFwNaoP4mLivdOFhdk16MHKs8GRzx//RQeSP35EXWFIlFYgE1WnFBbPECBZewrEVeptckGVSg8AFL3fbb0uz4D23v3l367Cexcihpq9BF51NQxzH6juzklXOubi/K4ZeXEfolhtVJUxQAZxf2owu8xZD1JKACU1QZliD7HYHfniXAcB+d3PAYkHldFspxHJSbfj2It1mgrSV1jt12Ib16aWm9vTTIjaKNnR0BGzkhusTeDJPoxC69b6dbcLiKbzqmlaLIXCqtjDM5HWl0XS94dg5/AYR5gqFDl8wH0rVef0fVwv6DZjyxlipMzv4PO1ln/zcSH+mN/AibdLNMMA2emSc6S+g7+EzQ660qEIzj7yVOtOrU3E7EeOsB6ff5WiBa9ueHk11ObiTOiUJtMzR+TYH8WNMMtaWBYzwA4c9Bx7AaFZOpdjqu9pf+JhrUtp/+shkEnXx95Ut9nnKnLYlafviQPh3Flrgx+kd+PKqzp5N0mYvemPiiUpejQcIQd1bNZscwc0ssY7iJcYKmp+EoSIJxbQBIl70OOHAlzyVCryjoctpj1LNqBORSorzJdoM= X-MS-TrafficTypeDiagnostic: HE1PR0302MB2732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XO5ugK8DbGZwPfHdLkRGNjK86SwhN7GzZb4kt8JSGtXg7++koTJEtojOATT2q7GhJM8ynNsYKrIA78n97k8fZidNYDPB/15dfXRcJ8UJ1SQLA3YhyBGYRywY4gBhNvJKzkQRhjkjqiydf26gLQ52WAGUcuruQPVrcntwhv2RejJOQ7Fpj80NWyp107GFIN1u0Wbtc+x3jybdsbuwbwm0AL2xtjYE9D9pAB+c/NEQejjrtY8ZbhI4a7FWumvpEtud95VBr2oU9UNm53DnN8aENzThhmYiKGdqKfP1JxoK6alsvPrXRgPgYDP+oxpSRQO1fkLhXfC5dcvQSJ/0sRYzTKfAAkefBs3squ1/6/d83V7+ZF7VWqKQ56ulAwObJdHsF0PEpt3F5Acw+OzhhKFTHl34ZjFRkUcHXP/9cHXthb4c/JbTbbI+7XDFZmPxreHJ1srFHuS6RPm5s4h9yeEPohJfQVQb1lqdqPLKvsGh576DA2Uqh3qU5AHTw4GOIR/UTzQ4pFOPiwnuXeaohGQuYgiIygDf6zFdnBz4fwgUt0WTtAPqpMJ3PzKNQplV9FxPrV1qFb8NX6Fi0B4aig2Tlw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uh/yLWq0We/tsFzTXFWm6rL/PJx4dvXvYCNHBiUfgk+kElQTgeGcCkBz7QQYBOfE7AR2I1qlaeKMEnK59XmI/uAgRf9tAU8i7Rp4YcydfpAJFbCxWO3tfN98RLDL8OGKgu7+q0eYv1tBqWdTw2nifOyID2RK8QaiMD76LogcuZeHXDLjiMGh+4Ns3iw80hjjtqf5KqMj6PvHXKGvHIB7SojAIjBJhYc93lBmjhS5g4Yl473a5I3ERRIJ94G4R4mqiHBg5WozvBdeNfeEZlmzZc75G3+2jhJBfCQE9oGibKDH4r74DNYMDVQLdW83GzfphM535gQsDS/RiIJJ64cBNTHl/S0G5U49zpT6y5Y7/6GzEiKs0pSvArPfs/i4dSBhbTMqwRjt3HSnAqD1Z+iuTNyyWPF6b8Y12ledVIbUEWdhYTgPeOu5iogT+UPrOWqYYGxGxjytgiVvZ0iNxq63qCVhYV9K8jvWBqs/9cjvdlBmcXoRTGUIK2BphqRonNAGF7ZythbDjIZj3DV5OeCkx5s1qmLlBYxzqxOWJiSwG4828NzATMDB7+bUxIPjAluL7OgWTp9h8BIHdk9aZt/n+gRs3DSf0Lb659JJKOmqG2muL8PRygv9WVPSrBY0Xa4nFiyy3qmWzE+zueVFVskDOOrDpUctKVZW9IAMhsrdF72F2VttpqjvSOxR7ZPtgIJBB/3YWeweFyHrltQATDj3I2CXGfZ/yRyahEFpPlGm0u910kaqJ1RWytaV/w105HBMjO0x65eDyaNlauVqni0rJtA6bYSA54bvl4FHeDmHdHoU/FJODq1/PRvCqW4k9YkmSmgeCbhiwYjPWOiBBoBwSSP1YZzaK5YPiMG1NUSUkeAIdFb8NB/h359zkCursWHf9Q14aMLNf6fVDkTwmnaB4D6U6NFS2iMN7LNMaMIQxeeTTcghg4ImqgO1UWiwWz5XJAweQXL8PgOwiyxrKwRkrw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a262ac5-5566-48f9-29a0-08d9df6a201d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 18:48:35.1862 (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: HE1PR0302MB2732 Subject: [FFmpeg-devel] [PATCH 14/18] avcodec/h264*: Remove unnecessary h264_mvpred.h inclusions 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: cBIgx7iHKAME This is only needed by h264_cabac.c and h264_cavlc.c. Also fix up the other headers while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_picture.c | 9 --------- libavcodec/h264_slice.c | 3 +-- libavcodec/h264dec.c | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index adf8a32378..dcd5874c2e 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -26,19 +26,10 @@ */ #include "libavutil/avassert.h" -#include "libavutil/imgutils.h" -#include "internal.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" -#include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" #include "thread.h" void ff_h264_unref_picture(H264Context *h, H264Picture *pic) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 32df9fd3ae..dc636c5e78 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -27,8 +27,8 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" -#include "libavutil/imgutils.h" #include "libavutil/film_grain_params.h" +#include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" #include "internal.h" @@ -40,7 +40,6 @@ #include "h264dec.h" #include "h264data.h" #include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 3706ae0e31..ed9a74b0c6 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -28,29 +28,20 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/avassert.h" -#include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" -#include "libavutil/stereo3d.h" #include "libavutil/video_enc_params.h" #include "internal.h" -#include "bytestream.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" #include "h2645_parse.h" #include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "hwconfig.h" -#include "mathops.h" -#include "me_cmp.h" #include "mpegutils.h" #include "profiles.h" #include "rectangle.h"