From patchwork Mon Jan 24 20:09:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16394iov; Mon, 24 Jan 2022 12:12:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGT+0S0uTbLSa6Aoo2T1axKV/XYQol9B9tCO+t5kZA8Cll+ZkrgTPfReoYv4VeNtgOKhsz X-Received: by 2002:a05:6402:5190:: with SMTP id q16mr17606441edd.157.1643055150728; Mon, 24 Jan 2022 12:12:30 -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 n11si8968118eda.99.2022.01.24.12.12.30; Mon, 24 Jan 2022 12:12:30 -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=TXA8ZIAV; 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 9455168B214; Mon, 24 Jan 2022 22:10:16 +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-oln040092069053.outbound.protection.outlook.com [40.92.69.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24C0E68B1CB for ; Mon, 24 Jan 2022 22:10:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EXusySMcB+MVjAqrEkAQqA5ZuqEuiC23KJruU07TqwrQfbjOTQIoByxDnzugYhOYRIV0t01hRpUjhP0lqZVv2rEE6xZTV+xAkzPYYg/mWGNMPEZsuT4UHtsTXgEUhwudCTdXkejFvdcVCFYbydbBvmp8rC/QhhMfJVNaDXikjH352JFPmnFrmmNYhmgPiBjtWOmF4m7cgcToo1pqQIqtPgOCK/UNUUWoYVytG8snYXKjbNyxIZ8WqaoGfzawKPC5nzyAXfsF8HZW3xrWia5bnOmtWrPcDfNJVcHkeXoLQpx27zjsXXp1sStrYEB0pMQsqn9zLEcVLbU0msM0gTb+3Q== 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=uuB5Oe6Y2dCxV+ZApeYG6gFsTxH+3VigyTnpI/1dbIo=; b=HpDu98+RlUGr1YbGQ7bjKNC6sUbYTATXCgeQ73Oml5Ggci34CqWcqMnwvq0jdxRM/OjgeldzmlLDFFKlPYRwqiWucUwdGhoxj1V0tI7jFt/3DXhJbR43pn9gQPRJ2HnQcZgFcjru4j8arsfoSlO0+P7ob4rL/e9/q4WTdXGqmpfd7JjV5aCQmclkNxk2tHpP+JyATdWDyk+FIxbp71EpOzUnamhrhQ3SVTj8DkbPD499M9e1IjcDb13Z5EUcEckFy1xSmxpg9QvdQEymDkLzSV/yDqH5ZSCTxQqYK2ONfDPxwdBjgg+77gGy6h6XaXtonax6YKSqTsspTwY9+pkFiQ== 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=uuB5Oe6Y2dCxV+ZApeYG6gFsTxH+3VigyTnpI/1dbIo=; b=TXA8ZIAVwHZogNmUQ4dSSU5ArjBQWYVuc8tbQ1tQkmG00CqfjJp8NL/VpjPQmiSOVecnhcjqjnIIwric5Sc1lYTC9QYmw6HiGDfSr7hrwbP5w/9/+L7x9fRiEkVWh+FAsTU9fdnteUUzoQTS/cvmxwG9CRhAkIUTpRTzWG6bfY3Id7qqk+vjehuUr2hbrLy/aAVNQYgdnnjkyggRtLoaCP8F/U4H5lVp3XHW6MHoc/07FKQFJzcBSD+CHG5EDC/5HKD60GrwdmvW8+ansCahObEEWVK9wTuFTtsjLnshz/dpV63i2lXibSXLL010rmQRrlaGPoNs5G1jHXOlsUGzpg== 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:10:10 +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:10:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:30 +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: [z6a6F5v1yImh2pXD5b/AE1G4J4RUdAnp] 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-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47712f38-a9b8-41b0-68db-08d9df758631 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxsfp6m0uSpQM1UXlX/DDSKrvjqSouaV3XSMy5Ooi8UPtWoO/QO1gwtTYgAp/Jr2RaWo1YsQgiKrJOHD7Sp2jUISlQoDq4Pxjq2xXbkG3sgimyqo1+iw892rbhNgPWhvdv5/YWuDb8cMkKK9vIhLPtez3h8t/KQVVA4QFh4nWUFIDDauPouc6MJgcjxDHxa6g3McGyMDh78x6tokvEVh97XDUmXorTMmTRJTID4UeLoPN6Xa51kGSinAE7EoC2id3ecJbR+TuXhhYU+VcSKKdQ6uQVsHgR34VLtmHoDqp8qci6U3vnFdd9FPGq9Q1CeCdhyqZBvjRxd+4rXa8AjVahRFI9Z87pnyDmw9KF2WV+ry0di86vpb1khbQ2xrmU5glRS37LqcUA+xxNva6ssSknj9XI3mwVET7SMQubLn8rjWM1HnHddT59m40IGYBOrpXXowry6svpM2ETmRBj6a1DgHVfDfabFUPKqsvgNoiu8tT9wh1kmJPP55svGeBANICsBENJ8l0DY+QTFzi6Y5qU27slYNWBEjFwO5GDgV5Z18Qa7GsNWDnFRGJuWNk7JPeL6oNDaV3WmzM3l1JaIUlHhqBD9b3RkH8qWSeZkVQ5/2AYfC/JqfVCVEgls0SQYPex7LRxv6BZJ/oXfLPpsTERiciweGP1M1Qj+tB0amu86nV/FbuMS5HQb6PbbxG9u6AIQPsm4QfG94jiR52fc6YflK+oJwPrv+GkOwg7DgL7q2w= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 42Y78zxz1t4PyZlsqtSijSw3RiTPpeKYQNayG5L4SlNF8h0WUuat3WKLiOJrb7eq+6/ArGKCwXixGi1bfWxhyD+gz7rizPE+rxcIiab2hKFcdZRK4veZLfe+IBcOvIC0riMuS61i6LUi0B0iR5Afr5QlgzO6Nhsbps3wwQNeyZ2RERWlJldqD64aRdnUzPfgrXNQqe4T//7EoxH0zp9MR8fmXCL/55qxmSe7EuC6HZaA2Z5iVP+HqtlOmKbjHNFNX1SLiO5hhmk5jNIlD/rBbHnUWt6uOMnjuL0wEoGyBr8wTCY99TYfmI3DS8q6Tjtlbs3Xp98nwFegtcCjQxlt7upSuRegZGtoJnToUemTcOL5sr9VMGoxXe4FVCMtyIR85xnLFhTIwfpN6uIyPBHb9sP7vFYS5dLGg4vOUHCto859S5b3smlqzC4OP4x9WvajwHW18aad8rNKC91u/OrFwiYHSvzOn/p6HPk8bKYdOATfCGW834TKJ7zDuw5SZJ9zCFmzz6ogSeznJG0FtLBui5EqiXTuKL+w57a/rIuKnOxPY9iOFpb0ZAxSoCI/A/a5/hZFcW4ysysJfxszJFuxkA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EYrtRhm6b79WFjkBM36NmyYqH5zEJt5vOv0rKnQ4C8GXX8SqlxB4g1PcTDL2YHjtbfqlmuMXe9jgFokZ102BBdT5B8YUQ+VvdEsr0bZz+RwsSzqhXv5DQUfO8bF+m7v6nLBiZnrDLh7LIbPA6FkZayWfN8/oVwqZgH+t2Ht03UfqyKlA35LWJ8R2nM+X1842rxhspDaT4UrATchNOOzBu8nueKm8HFOSEZfGei+Uhpv03WKkWBoQa+QTt83L8VOkltKCwEnSdXRzjp/6PiywbyIAsDFRLtYGk9H3bEutYiGIUkvLTgmqZiH1OMvTQrafrZ6HkyoeVUbmD52kslwdnCz42XGq23H+RJDmM+duGa7FZKtj6EjyIiaMuC7urVB/9IhVjRLcRsq7aFdjEfMSOjglcX9WNobt78x9JDKmDGSOdRpxFpWkq6trq9lmhNdLjeLobbGOHs+DY8jD82Fgd6Y66oZIHH3hSoafXxcuEHiyQ8RbcZrxzwRXJBJyS25DqLkRkbjTNhnxl/f5JLkDQlfMgdmqKPcp0DzsLw81XthJrU+aN2qJaPdvGucYn+QRWHu9o7EBW99fAY2qiSOgwGTbf9hwv/q9RdaPeqSYGLTAwRWNbVctHsuuRcCxdYXkbblUKHD2as8EpKg/3ml2KIXQvM/S2NSg9TAmgCscI8FWl+bM8G8y0HlsxkuwXyqi3e0/ghCqDO0et3u8zOUj7V/lQqnR5cqEp2GcwQiQ6fGG6Y/NrBBlr7EZNCFHZw0+Fde/JeqHYhCy3mxNnORHPXa6bDfU+tZV1695ptsBwgdz5bNgWJMbtgQeylKh6upjbQfQaP5wgTXpaXz3PHnzOYjYvdshNbW5pGdSlMwR0OZV6Ld3kYzHcp5qAkp2p+Fljf694+O/HPu3TtM9eGwQbZ4Xb2MvFqTfdRhEee9qSD+3GwwyUI5iVP/truf3tuDTE1LknTcnetQkKIXKLJw3PA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47712f38-a9b8-41b0-68db-08d9df758631 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:10:10.7063 (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 17/18] avcodec/h264_*: Remove unnecessary internal.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: v25w/HDhVvIq Also remove some other unnecessary headers while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_cabac.c | 1 - libavcodec/h264_cavlc.c | 1 - libavcodec/h264_direct.c | 1 - libavcodec/h264_loopfilter.c | 3 --- libavcodec/h264_mvpred.h | 2 -- 5 files changed, 8 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 884d392022..703b27aa96 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -34,7 +34,6 @@ #include "config.h" #include "cabac.h" #include "cabac_functions.h" -#include "internal.h" #include "h264dec.h" #include "h264data.h" #include "h264_mvpred.h" diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index fa8ba5dac7..9191df0303 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -28,7 +28,6 @@ #define CABAC(h) 0 #define UNCHECKED_BITSTREAM_READER 1 -#include "internal.h" #include "h264dec.h" #include "h264_mvpred.h" #include "h264data.h" diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 8f07981130..93c2e1e438 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -25,7 +25,6 @@ * @author Michael Niedermayer */ -#include "internal.h" #include "avcodec.h" #include "h264dec.h" #include "h264_ps.h" diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 558ec6c02d..2440cfa831 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -28,13 +28,10 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" -#include "internal.h" #include "avcodec.h" #include "h264dec.h" #include "h264_ps.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" /* Deblocking filter (p153) */ static const uint8_t alpha_table[52*3] = { diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 19d9ee462d..46ae2738f9 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -28,8 +28,6 @@ #ifndef AVCODEC_H264_MVPRED_H #define AVCODEC_H264_MVPRED_H -#include "internal.h" -#include "avcodec.h" #include "h264dec.h" #include "mpegutils.h" #include "libavutil/avassert.h"