From patchwork Mon Jan 24 18:48:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp577972ioh; Mon, 24 Jan 2022 10:49:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuEndEvTLWrWCVSlIHVXdPHuEA7DQzo32dJuv1k8pBbXEsszvmMoRovaOwSDJllUkLC+IE X-Received: by 2002:a17:906:cc84:: with SMTP id oq4mr14369160ejb.736.1643050155828; Mon, 24 Jan 2022 10:49:15 -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 10si9338105ejj.230.2022.01.24.10.49.15; Mon, 24 Jan 2022 10:49:15 -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="L5Ji/XZN"; 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 DA31D68B158; Mon, 24 Jan 2022 20:48:58 +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 3E37A68B112 for ; Mon, 24 Jan 2022 20:48:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zs4CGqckyz5VSNqjzvlMbcRRA81aRgRbV6K0uAgouUd4awL2yFRhbetJFdZ8l21s+dRi5zUN8RMzqXxWiW24KgpTwLlwLD0l0+MXE235PKCsnW0e0J84RWOyFIbVOYQD588X6yXi3n0vGGeegGH3tqgeCTO65KhZ32idhd+e/H/hPI/mqZs8n6msAOZmUGwqe85brgqKkd0YQv3RbKBi89Ggj3sW/FYWNQQ9XYktGTgcD/UNXaFpAtJPLzUDRwd9lUnBZDOBW3+dbcOdwTRbT09KWP4P/6iDfX4UECdVuvnmEegyIam0yV7JYWSmWDFPL7cZ80raK2/cwPcs2rktZg== 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=tIG62IqA8/1JoST0w5NgukPh3YdfCEe0qqH5oDtQOyo=; b=XfhWVMwURprZ3ffUb6N35vVu4zrd1A9UB+a6jUzVdR3KA5l2BRAYAzQp5XKCDq3DWwp3BcSsotuBz6nxQqwp5c3aa1O8Q13GxbDEdQDONVwW3eYOKvh/gxOL2ZXXSemYRkjLEQES8lecM1dOTSr4iM833DPZ2xt2Vp7LdHnVzvqX6M6ec2MdzZ4qCOLf7k6FbSIr/KKz+IjrN3PiLAxtQCgWV67yE20mlo3ffpJUGxzLbULZhoxRMsa3J0FZOWFoZEk5eAUotGA3FEdDi5l+i3hfwQzzUvDnlzQ6j/SAXC+N64gRcHYCrdYOc94PDdXpsRWllZEfHHeXNPZNk1IpLA== 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=tIG62IqA8/1JoST0w5NgukPh3YdfCEe0qqH5oDtQOyo=; b=L5Ji/XZNxSvOV9Go1S9CY6Fod4kJkMNR76VhNMwbShFdG74tIZ1zl6F08jmo/VAThh6T4svZylULZKJprqKGYFiYhhQG8bBMjMWQ8RfkhEF9dcwBy/TNI7hdBpGr3aDTGna4B/E+TFGf3it+sxQ7SkZyvS2s7ih6xA+imwMZk09wPHLXDaZFZPu53fbJBfoJ9DSAbWptWjAnykTENmoDp+gqQWmNXLOKTwkn3jF0KH/ueAniineA/Wz5qow61q9fzLpuvWLraleFKnl7urnNo1BQclFsLzziVjUR6YpIXhL8LLK1NGrlexIt3JFGLsc0CutqOjas2C4TuecEXjsgIw== 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:43 +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:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 19:48:26 +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: [RW1XcFkFQDto4M7xZWnaOXzMkv5ho+2W] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c393cc5d-a9ab-4148-75ec-08d9df6a2565 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTx6noOHscShK1NC/ZCi4M6SJHcJFgkXaU4gaCdwvnYOsRsrUx8DbRSDltRsLEAJYScDR00oV5BClghUmUi4RvyM3pGZIF3ytp9h2sgqKbHrU5pWTI22hFzH/AJc4RglGfNtiBuYs7RC56wesxr8SpYeu1HGv8aJrQUW5+JXJfex6YBrFNWs/adRUgsC26zpdfLSAs2QP/7YY5yxrT3Yj8ebPDaF2XPFLsJUCN/bWu4C1mazI2Uej6cKGbYDWw8lL340EOhotG/raaTuRWwIyUDTOi0mNQGNBj3J0K9PvL7rOy99FMIffmvulgk7U0EtextH54r4v+LiIJ2iI/ORXViVPFjXWMc8MyVk4R6hKFn42iEnjntbqqM7dPtUos8eHcE4u/fC0hWuRUwlO0YgpMxXWQpmG5R1b9CvWxD813+WSiFkQgFN+tXdtVXllf9Av6KKLp0Q8WQkh0T9NYbnAntyYKifer8pHAgesAXqWZituNzXZt4BZUmb5iw1Z+tR3Af6gz581EzA0ZBb+3O3hYKapu3PJOpy5AwQhOkpWOfyT3PFu/CtejGQpRXuaTaT86nsHSP2/K6Vrou3OsRcf29L4/H9NqbhmakbREtKKLbZsVHgAXbWn92WCMOU7bssgof0O8iUu3LIcoSA9Otgh8wJtSjvSaMJIgKAxoPt7h6Umg1Q2Sg7aW+NVbJDA5IOlOB6zKZRE0I6uykRMyBoUORyHZPw4K49kvRkhlRpMaUf7M= X-MS-TrafficTypeDiagnostic: HE1PR0302MB2732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FNbhvostPhifIiyfuNQZ4t9Y//TQsnp4eB2qkadYLW99klw55NMyDszHvuTp0+PIoDAzSqySIPI2CtD4gim6TioaXS65Hu187UdP/LcdxKqJZi+tZTYriZu5JENpOpr3qcKnnjpMtSiafrir+eWMphQZRyHF0hEnvW+c311BQOpKCvVBJA92RbLJZoweZnwzxXc0j7t6ZY2RHuaGJCmRn0efPUbD8tfvtN4WeD49/dv6c/z/bYdLL5c6DYNCVoY5h4akXzOCXTCE6kYpk1S4P0bfbjaRO6qw7JdYDlIvwFeg7S/r+kMx4UC2feXxX6T70x/lrUc1tLQ59mjXKNTi2sYmhv7yD+ck22wRiqN70VXNOknKuwxqtxfAOau3T6qh5flP5S3LbTaroPJr887o+XhGILtuzLfR8jHIO8AbMLCb+9PfxgJjgDsCOYHVrz080xsH4NTS8DMhiRYKvvlMdjX3WqA64cz15aKEKvYOmHkyRlHIW5qZDNeViCI0GznJ+XEYLeN+M+HEs0cvQmpsxDqnHzEr7XtiwMqmSuGRu6FbgC5PmqO3bC7Vnj62qgTzOsN4tHHmn4z93hqfl++SPQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VRb1RkL1njP+ehLFXc2DFRrXegu119fjdSw3eYtwB9dtI+xmaBWJeAWfDzAotsCaSwRDEVR0RIvX+rESRATkukxlXy65jC21nPYEUmNKwXbb/eRyYEwAxvXnKtEhkZSIEcP7T7pWR1PDEm9BMo/8iso9uZwmhakvC5FVRoqN4R9iFoAK2FPgJ9nKAH7CtHH69+39RP56clAP5aAwncHvc+lYjCeK6oZaGATcWHTV9jL2Mos8KgodVDhIV8XjqCqJPNPn6Rhgn9t66iAdIcEBXzegDE1B7vHN6s//oc+ofCJ+bmMyBiIDasTqraltU+n0dV9zeLpksdEcNM4Ktu7QomgHLgcABaZn9Q988FKMr/BJM5EhdFDj6Ej40TKpyNo+n6z0Qs9E5hnoeq8yC7cj1Vh/PtCR+JNDVukfJ7ezUGzQJ/lt1AF7eH8np8BTr96zJ649h/5Cf/KnLW1A97gHyanBeSWVn4FLu3brkXeDI2hDFwtQqhuJN5BWNbRZjczmN4S0MHTP6oL1iUiwbzUF2Q0OOmfJvtRA17rXRWPsM/I12BZUq/A0KC+/wCmjkmz8EXEN77quiQhSVeY8xEbOjBkuVyq0wbAjBdH5IOjoZvZ2DeHoceI3YG/UgLN4j/tcuaDcKxKBVjWHw4b8WOt7FW91EASrsFy8MWBHZo+efildF9AOW7K9wgZ/pSHD+9An4Z6K5uo17eXO2WbJKyjbt6f2FJHpSfTQar/xAcYfnkDPaELL6cRNCYhWeng4YVu4v6Gu6yZ8d3jLj/tnAIApJsOAUReemniglt9dZFpMSm/KRS94RMyhepC1vZF2mc/xrQjJLR/neIe2fUXyEvg8zNxFiJzcIAbIjfVU429iKIA4lHd1ySVhjrk90CHj6wWSzDUAuRDHydIItI30oLOyLk2WydaGIykNyReS/1l01m2viQIshSBDsmm5O4SGJWqhroROg3/TD13X3aDUVBZsxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c393cc5d-a9ab-4148-75ec-08d9df6a2565 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:43.8444 (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 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: 8l7xSnR+/I5A 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 040fa0a257..31a0832a5e 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"