From patchwork Fri Feb 4 15:16:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34122 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp3493503iov; Fri, 4 Feb 2022 07:17:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLkwRHd1Qfbd9mwzP05Yjlzb/Zl+z3NDG4oBXwlK6kErplI4aULN+ZGQypMVy2evyfAUn2 X-Received: by 2002:a05:6402:438d:: with SMTP id o13mr3408293edc.258.1643987859404; Fri, 04 Feb 2022 07:17:39 -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 do2si1435707ejc.362.2022.02.04.07.17.39; Fri, 04 Feb 2022 07:17:39 -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=CcdZKraX; 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 5EF1C68B295; Fri, 4 Feb 2022 17:17:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2060.outbound.protection.outlook.com [40.92.90.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E15968B289 for ; Fri, 4 Feb 2022 17:17:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P6fCqeVdiHwLFjH/Cb6FJ0OsnPsTxxGfX//EKx0po43uc4QxwTYPzcLVKv25Gv/hJLLnRb+RHVTIdoevWoNvsd56ZMTOjspOBDb/urHr+Ap11NEQbj/hYEROAWV7du0xR1N6C1ynwJ+iEAPQpd+QIAD9N62R3Ef2G9H4TDuURQAyTtuKYuoTzGUDy9u5tCtwkFjpkGM4vfNpjwc2N0PcHLjFk2cceUjWVdllGo7nUohYdS18qSUiKO+PjtQr/T0zNlCBBYntBCtWQKqBcWrZ0D6r+2Bud2o6Mre7c4DLg4xyQQxo8jRxFgdBA169YxkqfC11UDPJkujnG+F0C/Chdw== 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=eGeBViGa9amvDUIraPrDKqbQOwtT9YjXhoc/Ok3+Yk4=; b=TpdqNwCRyRFbRgbPq9ygQygQJ7vKrfU8SCgUP8o9Om33PGhd42mUeB0Vsmgd1ZSwtt1ltwTqjCbf7V3G3TqKAux2QfiQdUHajULWO7dWmRwI4V654ihvG9q5XVtshyHLzwPajxZBa4cPwlnuZkr6zbHgIMsKWCKO837T9rr8y6UXJItdQO2DYISBQzLgPcMUEU4D+Lz2tMcQ0tO7Mwi2n9jEgx5oYhQOFNHzCgpqpbwyQO1fhUDmeN9hL6MHTLtk2+odJ7WD2lJzgY2Ekttnjt3mKsyr4IyMX0bySR8QHpNhere6ojwYX/HNUdOaS+PTUrKq4cSjyt3D7qBgjQDAHQ== 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=eGeBViGa9amvDUIraPrDKqbQOwtT9YjXhoc/Ok3+Yk4=; b=CcdZKraXr8kujCBhLnxeG7YW+FnUg8GQunbN3gb1dxVf4H5ywxxNtVRyq3mEFJgMNoDkChFXH9Jxu9SpNIuJIst7XJgS9DYsjHKgBKDMGGj/hrELCMMFVgsIXdyNgOg3oaB8IHBRttEunid67G+wycx8S1MdVNBS2BfTTXb8e41bKISH+8MOLwdeXZcflC+kIbhm6kct0pGlzNoH4LYBOYTEuJRMMhjHaCIF9LPalldmknCVAFVDDKOKhBuf0NlutaxZymbqgTvD/1xjKWLZRhLC+DOrrH4iVhyJWtJb5qvYNmm57NFwvOV2vZxHJ1Y5ltrcXYSCUB4YS+tc+EqGwg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4703.eurprd03.prod.outlook.com (2603:10a6:803:5d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 15:16:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 15:16:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Feb 2022 16:16:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [mEvUQYa1KylM3XleumHsvoo+dKqPR5OR] X-ClientProxiedBy: AM5PR0101CA0032.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::45) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220204151648.2148917-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8362d0b4-76c4-42dc-88f4-08d9e7f163a3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSjtu7sMDnYCqklgc/dtjmmUqGTl3bq4N/hlp049pXmZ1uvZJpDWB5beqGcOKpzHZRo5RZiDugtN5UWLoPuCQrvZ43DkxaMAvhWS7KVNal8OdIwANYGbVMXSsOsutZ1b+tDh/t0zMMaX7fA0+CWaONGznx4hrq7V1gubB8ZG3t3gOMRmt/HHVk2X3szMh26qOTGBbA0tey7E0Nz/as7rV6qZVDUNbSsAbrLOEaYGqk1+kwXSltKuFTYrzPetAKgjOCiRF8MUQf3df3Wsk1hfHWHTFoSkMuYQx9X+BdxJYsEa+dZEZYWboFcWaHvwIL7xDoI8OBwmm1Kib8UsFB4kTh2o1jNl/Wur6Vsi82aBOegFsfDoHlx4LkBbb7MXJ8K365soNaEOLdqnRC/34I6/LGukGumNIg2EPBWanSQqBooYF7v2SrDaqXcUNgwX9S73yQn2pTIvjILqNv+eMrDDeTjiHtQ3o2M/QMizpmIbtv1bVw4GT4zO/sFzK5YdIJHekyXIWVOW6cZro0C4jc/4GErPpnFRHk7JGayE0osrVIVIujQOidlzLpgjNRSzjfknjhvELcwni9z+HX7hB9LvmiPMmwEbpIDJDKZuBT85NAjuQc5gtw6E4DQb2TGvBF9SXkzpdFtsW7Na6tYkMi7bk8mJuQCGsuOb6ba/ZuclG3/ZC3zIUmwXG0NU37bEIRqaNIVyPNvaJZchzBN8jhAlUzF9bA7BHa27P66sf9ICyDp/aIErGLykHD9P8mZqgC26SQ= X-MS-TrafficTypeDiagnostic: VI1PR03MB4703:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9oGdz0xpSGqvhbuQFKeEFzoG2tZMW4zLKSIP9WNWYArcNDJVW0t+5popc1xn5KKKTxgScesGY2VMWJ3lrtrjGCI6ceid/Pe0IhOnGVAujPvgI1GnQwVt7ZJR6+BHUJZ5eh3u/aX+rUBFNd7EEsPyW1Bul8wxqKV7qzkWnhKMg0RGWhACZX8eUXKKVkv63xWiLZwhNULKfV2MRDGMS14RyLvwJ1NCwURkKkIRa1Op7E5CkuIaMbUzrTd3mrwCbuXlBvVw7namGaMK+2Z0qTp1HUFk8u5qdLyhFKm+vHES9D81pP3Mr94Wv/fNja46rF3Osf3drI57YA3y22hM6AA8zswL5hXdo65mvLwI9lTC7E6YclQGZBKKDZYP3HU/RG4G56K+FxQ2kjJXx/c3tQEAJk9y5bnvI5PPX6OhaMCTzxeuQIGCgWGfE0+vQgBXMmMMMIOCiYszqFhc5S6o3lATRpqJTgbfnoCWbv+J90zxmZ4LM4oV3rKay1Zsd+e6GJ+SBfSPDMimCO8wCVoQkNlmKJUWaEJ7HZYlkJfDSqg7tW1+2PmtMKmrXzMoF8tdr7VWrIbFgDG3H7zfxkTYoeshVg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OGorecWdz7n97Kns2hlGyxaGibm0BT0s6HIyzxOVNdEfoeZ/ae3j9YME4mGt0IISgD/Bxw1L/y6c82vm5lRPSOID2XDe3Cf6pos7TEZFHbsaPhdXathMzSJcqNBE1v4cRosBDuZojOHDDSW6DViqGoX7WZs+KuxcSzcSAwckUxLmOMa24cS0dnoAbWVc2Adlh9ZHynXBOwjJiVFq4OYGmpR8b57qLPRzUq7Y+9Kkdla18zv8GAnV79g0GQMOh+8beNfoFBOYhynx/6FE9+hLWF0bVWPcbbKBQLaLIrUILYb4gzkCSk7PzpD29WbXBTIJtAddX/n91RUzIsjF9cnMx9Vp+9PVP9jmoYb65XCc7lHR14ZsKK8zxA7TYfXs92OJPHlSsQ9PqCTMrBOitpG/BjE5COzwDqDcJDeuTg/7iZpjt8J7/W7ymS5CFCEvqLsYNcWhtxOphl/Pa2qtvDmv+UNSSGgXMIMP4bCaslnza8gujSI6cgGYBe0+WAdj5qpl6zRxypOVTz3o7kIjSDkdByq1INAbwyHGuT2OvyN6C/SPNoNT93GWmCUPGw/K1tw36Qvfeg+cBWYO1+gobcX5IVlyN5pQ0pYf3RO4ShCR13v7nyuAsQ9vBQOGbIvX4P5Aw5yjiioGWmHTu7z9CN9k+QeCSEkwgdFYIR7kOghGB7ybXwsf5HzrH7G8/Ynl/uks9AVoZ57B9TM+bpAQYLt0vJu85Cl9AbggD9vKARlBG8DwPtMq5owA0drv3Nvws4XT686WPvODvPl0OVGOyb/J4m9byBZ2d7VTZvgRNqtxRya/0TujhHJ1vaxEngLC16hev6157/8xhrgJrE77RVhdbfngAnH9fM04UxUEvBj7O021objRBw19gjzS50rwW9tVHdj92Mv5iugCl/KbbfH2oj8LCiVKKUpxF93uzMA0UiWOfiGoQ2+diihUc3KcxHC0Vw4Jt2LxPZKOVMzhlaOpoQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8362d0b4-76c4-42dc-88f4-08d9e7f163a3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 15:16:59.6931 (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: VI1PR03MB4703 Subject: [FFmpeg-devel] [PATCH 5/7] all: Remove unnecessary libavcodec/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: 3I1HiqgDw0bv Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_adtstoasc_bsf.c | 1 - libavcodec/aliaspixenc.c | 1 - libavcodec/av1_parser.c | 1 - libavcodec/avpacket.c | 6 ++---- libavcodec/cbs_av1.c | 2 +- libavcodec/cbs_vp9.c | 1 - libavcodec/cljrenc.c | 2 -- libavcodec/dca_core.c | 1 + libavcodec/dca_core.h | 2 -- libavcodec/dca_lbr.c | 1 + libavcodec/dca_lbr.h | 2 -- libavcodec/dca_xll.c | 1 + libavcodec/dca_xll.h | 2 -- libavcodec/dcadec.c | 1 + libavcodec/dv.c | 7 ------- libavcodec/dvbsub_parser.c | 1 - libavcodec/dxtory.c | 1 - libavcodec/ffv1.c | 6 ------ libavcodec/ffv1.h | 4 ---- libavcodec/fitsenc.c | 1 - libavcodec/flacdata.c | 2 +- libavcodec/flacdata.h | 2 +- libavcodec/h264_ps.c | 1 - libavcodec/h264_refs.c | 1 - libavcodec/hevc_parser.c | 1 - libavcodec/hevc_refs.c | 2 -- libavcodec/hevcdec.c | 1 + libavcodec/hevcdec.h | 2 -- libavcodec/ituh263dec.c | 1 - libavcodec/jpeg2000dwt.c | 1 - libavcodec/motion_est.c | 1 - libavcodec/opusenc.h | 1 - libavcodec/parser.c | 1 - libavcodec/ratecontrol.c | 1 - libavcodec/scpr.h | 5 ----- libavcodec/sheervideo.c | 5 ----- libavcodec/ttadata.c | 1 + libavcodec/ttadata.h | 2 +- libavcodec/twinvq.h | 1 - libavcodec/vaapi_mpeg2.c | 1 - libavcodec/vaapi_mpeg4.c | 1 - libavcodec/vaapi_vc1.c | 1 - libavcodec/vc1_parser.c | 1 - libavcodec/vdpau_h264.c | 1 - libavcodec/vdpau_hevc.c | 1 - libavcodec/vdpau_vp9.c | 1 - libavcodec/vp9mvs.c | 1 - libavcodec/wma.c | 1 - libavcodec/xbmenc.c | 1 - libavcodec/xfaceenc.c | 1 - libavcodec/xwdenc.c | 2 -- libavcodec/yuv4enc.c | 1 - libavformat/assdec.c | 1 - libavformat/h264dec.c | 1 - libavformat/hcom.c | 1 - libavformat/ipudec.c | 1 - libavformat/jacosubdec.c | 1 - libavformat/network.c | 1 - libavformat/samidec.c | 2 -- libavformat/subviewerdec.c | 1 - 60 files changed, 12 insertions(+), 87 deletions(-) diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 69453c706f..267ef97572 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -26,7 +26,6 @@ #include "put_bits.h" #include "get_bits.h" #include "mpeg4audio.h" -#include "internal.h" typedef struct AACBSFContext { int first_frame_done; diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index fa273df9c2..27b7d1d8de 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -24,7 +24,6 @@ #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" #define ALIAS_HEADER_SIZE 10 diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index d2dfdb3580..4cbd7408a0 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -23,7 +23,6 @@ #include "libavutil/avassert.h" #include "cbs.h" #include "cbs_av1.h" -#include "internal.h" #include "parser.h" typedef struct AV1ParseContext { diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 4f7a6b255c..bcbc4166cb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -22,14 +22,12 @@ #include #include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "libavutil/rational.h" -#include "bytestream.h" -#include "internal.h" +#include "defs.h" #include "packet.h" #include "packet_internal.h" diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 04314443de..1229480567 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -20,10 +20,10 @@ #include "libavutil/opt.h" #include "libavutil/pixfmt.h" +#include "avcodec.h" #include "cbs.h" #include "cbs_internal.h" #include "cbs_av1.h" -#include "internal.h" static int cbs_av1_read_uvlc(CodedBitstreamContext *ctx, GetBitContext *gbc, diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 333d70ba4e..ae7f88a8a3 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -21,7 +21,6 @@ #include "cbs.h" #include "cbs_internal.h" #include "cbs_vp9.h" -#include "internal.h" static int cbs_vp9_read_s(CodedBitstreamContext *ctx, GetBitContext *gbc, diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c index aa53a110d0..21e033753b 100644 --- a/libavcodec/cljrenc.c +++ b/libavcodec/cljrenc.c @@ -24,12 +24,10 @@ * Cirrus Logic AccuPak encoder. */ -#include "libavutil/common.h" #include "libavutil/opt.h" #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "put_bits.h" typedef struct CLJRContext { diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 758e3447a6..80f3525b46 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -25,6 +25,7 @@ #include "dcahuff.h" #include "dcamath.h" #include "dca_syncwords.h" +#include "internal.h" #if ARCH_ARM #include "arm/dca.h" diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h index 86bfa62203..cb8e38a94b 100644 --- a/libavcodec/dca_core.h +++ b/libavcodec/dca_core.h @@ -21,13 +21,11 @@ #ifndef AVCODEC_DCA_CORE_H #define AVCODEC_DCA_CORE_H -#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/fixed_dsp.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dca_exss.h" diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 481a8df7e6..c1e3b0ddc3 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -28,6 +28,7 @@ #include "dcahuff.h" #include "dca_syncwords.h" #include "bytestream.h" +#include "internal.h" #define AMP_MAX 56 diff --git a/libavcodec/dca_lbr.h b/libavcodec/dca_lbr.h index 2eccbe1ff2..db7a676c31 100644 --- a/libavcodec/dca_lbr.h +++ b/libavcodec/dca_lbr.h @@ -21,12 +21,10 @@ #ifndef AVCODEC_DCA_LBR_H #define AVCODEC_DCA_LBR_H -#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dca_exss.h" diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index ab14dbcc88..316045b588 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -23,6 +23,7 @@ #include "dcadata.h" #include "dcamath.h" #include "dca_syncwords.h" +#include "internal.h" #include "unary.h" static int get_linear(GetBitContext *gb, int n) diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h index 3aaad6d370..d223133019 100644 --- a/libavcodec/dca_xll.h +++ b/libavcodec/dca_xll.h @@ -21,11 +21,9 @@ #ifndef AVCODEC_DCA_XLL_H #define AVCODEC_DCA_XLL_H -#include "libavutil/common.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dcadsp.h" diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 43694b51f7..49b52f805f 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -25,6 +25,7 @@ #include "dcadec.h" #include "dcahuff.h" #include "dca_syncwords.h" +#include "internal.h" #include "profiles.h" #define MIN_PACKET_SIZE 16 diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 8a4cac859e..e2550c4cc1 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -38,15 +38,8 @@ * DV codec. */ -#include "libavutil/internal.h" -#include "libavutil/pixdesc.h" - #include "avcodec.h" #include "dv.h" -#include "dvdata.h" -#include "internal.h" -#include "put_bits.h" -#include "simple_idct.h" static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan, int seq, int slot, uint16_t *tbl) diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 88bf5b9d74..b2d5446867 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -25,7 +25,6 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "internal.h" /* Parser (mostly) copied from dvdsub.c */ diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 914131e742..36c30c1dbc 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" -#include "internal.h" #include "unary.h" #include "thread.h" diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index d8a0c39254..7eaa72f244 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -27,15 +27,9 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/crc.h" -#include "libavutil/opt.h" -#include "libavutil/imgutils.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" -#include "internal.h" #include "rangecoder.h" -#include "mathops.h" #include "ffv1.h" av_cold int ff_ffv1_common_init(AVCodecContext *avctx) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 8ffe5ab433..ba612bc258 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -28,13 +28,9 @@ * FF Video Codec 1 (a lossless codec) */ -#include "libavutil/crc.h" -#include "libavutil/opt.h" #include "libavutil/imgutils.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" #include "get_bits.h" -#include "internal.h" #include "mathops.h" #include "put_bits.h" #include "rangecoder.h" diff --git a/libavcodec/fitsenc.c b/libavcodec/fitsenc.c index dfaa04cdbd..3ac1141b69 100644 --- a/libavcodec/fitsenc.c +++ b/libavcodec/fitsenc.c @@ -33,7 +33,6 @@ #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) diff --git a/libavcodec/flacdata.c b/libavcodec/flacdata.c index 1954f32d32..d96e3e0966 100644 --- a/libavcodec/flacdata.c +++ b/libavcodec/flacdata.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" +#include "flacdata.h" const int ff_flac_sample_rate_table[16] = { 0, diff --git a/libavcodec/flacdata.h b/libavcodec/flacdata.h index e2c1e5d7f2..ef21840777 100644 --- a/libavcodec/flacdata.h +++ b/libavcodec/flacdata.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_FLACDATA_H #define AVCODEC_FLACDATA_H -#include "internal.h" +#include extern const int ff_flac_sample_rate_table[16]; diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 6927fa7198..051f06692c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -28,7 +28,6 @@ #include #include "libavutil/imgutils.h" -#include "internal.h" #include "mathops.h" #include "avcodec.h" #include "h264data.h" diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 94b473257f..50bbe94917 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -28,7 +28,6 @@ #include #include "libavutil/avassert.h" -#include "internal.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index c944a6aacd..59f9a0ff3e 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -28,7 +28,6 @@ #include "hevc_ps.h" #include "hevc_sei.h" #include "h2645_parse.h" -#include "internal.h" #include "parser.h" #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 06e42d9c53..d496918feb 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -22,9 +22,7 @@ */ #include "libavutil/avassert.h" -#include "libavutil/pixdesc.h" -#include "internal.h" #include "thread.h" #include "hevc.h" #include "hevcdec.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 8d7a4f7147..ed012c4e75 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -44,6 +44,7 @@ #include "hevc_parse.h" #include "hevcdec.h" #include "hwconfig.h" +#include "internal.h" #include "profiles.h" const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 157bc6926f..8e26c852db 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -26,7 +26,6 @@ #include #include "libavutil/buffer.h" -#include "libavutil/md5.h" #include "libavutil/mem_internal.h" #include "avcodec.h" @@ -41,7 +40,6 @@ #include "hevc_sei.h" #include "hevcdsp.h" #include "h274.h" -#include "internal.h" #include "thread.h" #include "videodsp.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 7d7a1f01a2..445d5f3f36 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -40,7 +40,6 @@ #include "h263.h" #include "h263data.h" #include "h263dec.h" -#include "internal.h" #include "mathops.h" #include "mpegutils.h" #include "unary.h" diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index f9a0977407..ed24091fe8 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -28,7 +28,6 @@ #include "libavutil/common.h" #include "libavutil/mem.h" #include "jpeg2000dwt.h" -#include "internal.h" /* Defines for 9/7 DWT lifting parameters. * Parameters are in float. */ diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 5b0958733c..9c548c1567 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -32,7 +32,6 @@ #include #include "avcodec.h" -#include "internal.h" #include "mathops.h" #include "motion_est.h" #include "mpegutils.h" diff --git a/libavcodec/opusenc.h b/libavcodec/opusenc.h index b623b3e948..32d23deead 100644 --- a/libavcodec/opusenc.h +++ b/libavcodec/opusenc.h @@ -22,7 +22,6 @@ #ifndef AVCODEC_OPUSENC_H #define AVCODEC_OPUSENC_H -#include "internal.h" #include "opus_celt.h" /* Determines the maximum delay the psychoacoustic system will use for lookahead */ diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 3b459cc125..24fe44eb30 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -25,7 +25,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/internal.h" #include "libavutil/mem.h" #include "internal.h" diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6b77ccd006..9cfc21df64 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -29,7 +29,6 @@ #include "libavutil/internal.h" #include "avcodec.h" -#include "internal.h" #include "ratecontrol.h" #include "mpegutils.h" #include "mpegvideo.h" diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index 15cb87c464..d161a42c6e 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -23,13 +23,8 @@ #ifndef AVCODEC_SCPR_H #define AVCODEC_SCPR_H -#include -#include -#include - #include "avcodec.h" #include "bytestream.h" -#include "internal.h" #include "scpr3.h" typedef struct RangeCoder { diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index fb5a39303e..dbe8e4f516 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -19,17 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include - #define CACHED_BITSTREAM_READER !ARCH_X86_32 #define SHEER_VLC_BITS 12 #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "get_bits.h" -#include "internal.h" #include "thread.h" #include "sheervideodata.h" diff --git a/libavcodec/ttadata.c b/libavcodec/ttadata.c index aa9f418a7d..297d709480 100644 --- a/libavcodec/ttadata.c +++ b/libavcodec/ttadata.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "ttadata.h" const uint32_t ff_tta_shift_1[] = { diff --git a/libavcodec/ttadata.h b/libavcodec/ttadata.h index 48c4cd0354..1ec1d749ce 100644 --- a/libavcodec/ttadata.h +++ b/libavcodec/ttadata.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_TTADATA_H #define AVCODEC_TTADATA_H -#include "internal.h" +#include #define MAX_ORDER 16 typedef struct TTAFilter { diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index 24e5ebcd0b..234604f581 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -29,7 +29,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "fft.h" -#include "internal.h" enum TwinVQCodec { TWINVQ_CODEC_VQF, diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 26e0cd827c..ba70ddef31 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -23,7 +23,6 @@ #include "hwconfig.h" #include "mpegutils.h" #include "mpegvideo.h" -#include "internal.h" #include "vaapi_decode.h" /** Reconstruct bitstream f_code */ diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 71e155154c..bc11a7e417 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -22,7 +22,6 @@ #include "h263.h" #include "hwconfig.h" -#include "internal.h" #include "mpeg4video.h" #include "mpegvideo.h" #include "vaapi_decode.h" diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 4e9607d9be..d82b5b31f8 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -21,7 +21,6 @@ */ #include "hwconfig.h" -#include "internal.h" #include "vaapi_decode.h" #include "vc1.h" #include "vc1data.h" diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 00896ddb09..8257e0ccfa 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -29,7 +29,6 @@ #include "parser.h" #include "vc1.h" #include "get_bits.h" -#include "internal.h" /** The maximum number of bytes of a sequence, entry point or * frame header whose values we pay any attention to */ diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 5ba73dafd4..525e208495 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -24,7 +24,6 @@ #include #include "avcodec.h" -#include "internal.h" #include "h264dec.h" #include "h264_ps.h" #include "hwconfig.h" diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index c17de0c5d0..2669040f78 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -23,7 +23,6 @@ #include #include "avcodec.h" -#include "internal.h" #include "hevc_data.h" #include "hevcdec.h" #include "hwconfig.h" diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c index a8609d647e..49fe18189b 100644 --- a/libavcodec/vdpau_vp9.c +++ b/libavcodec/vdpau_vp9.c @@ -23,7 +23,6 @@ #include #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "internal.h" #include "vp9data.h" #include "vp9dec.h" #include "hwconfig.h" diff --git a/libavcodec/vp9mvs.c b/libavcodec/vp9mvs.c index 88db1c341c..774aaa3910 100644 --- a/libavcodec/vp9mvs.c +++ b/libavcodec/vp9mvs.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" #include "vp56.h" #include "vp9.h" #include "vp9data.h" diff --git a/libavcodec/wma.c b/libavcodec/wma.c index d9fda2dbfa..c73711df48 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "internal.h" #include "sinewin.h" #include "wma.h" #include "wma_common.h" diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index 5e552ce820..05e014a0bf 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -22,7 +22,6 @@ #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "mathops.h" #define ANSI_MIN_READLINE 509 diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index 55815e5c2f..ae258f559e 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -27,7 +27,6 @@ #include "xface.h" #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "libavutil/avassert.h" typedef struct XFaceContext { diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index a65f83abdd..31a263b8df 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -20,12 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" #include "xwd.h" #define WINDOW_NAME "lavcxwdenc" diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c index 5181a46403..11dfc68a0d 100644 --- a/libavcodec/yuv4enc.c +++ b/libavcodec/yuv4enc.c @@ -22,7 +22,6 @@ #include "avcodec.h" #include "encode.h" -#include "internal.h" static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pic, int *got_packet) diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 2ab7fb9efb..0915f6fafd 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -25,7 +25,6 @@ #include "avformat.h" #include "internal.h" #include "subtitles.h" -#include "libavcodec/internal.h" #include "libavutil/bprint.h" typedef struct ASSContext { diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 199e87fbfa..ac804c0192 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -23,7 +23,6 @@ #include "libavcodec/golomb.h" #include "avformat.h" #include "rawdec.h" -#include "libavcodec/internal.h" #define MAX_SPS_COUNT 32 #define MAX_PPS_COUNT 256 diff --git a/libavformat/hcom.c b/libavformat/hcom.c index b7fb7314c8..97f0003210 100644 --- a/libavformat/hcom.c +++ b/libavformat/hcom.c @@ -20,7 +20,6 @@ */ #include "libavutil/intreadwrite.h" -#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" #include "pcm.h" diff --git a/libavformat/ipudec.c b/libavformat/ipudec.c index a314a89001..4e346f9638 100644 --- a/libavformat/ipudec.c +++ b/libavformat/ipudec.c @@ -25,7 +25,6 @@ #include "rawdec.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/internal.h" static int ipu_read_probe(const AVProbeData *p) { diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 68ed7511d7..0ee4820f62 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -28,7 +28,6 @@ #include "avformat.h" #include "internal.h" #include "subtitles.h" -#include "libavcodec/internal.h" #include "libavcodec/jacosub.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" diff --git a/libavformat/network.c b/libavformat/network.c index 246ffd406d..96fe636745 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -22,7 +22,6 @@ #include "network.h" #include "tls.h" #include "url.h" -#include "libavcodec/internal.h" #include "libavutil/avutil.h" #include "libavutil/avassert.h" #include "libavutil/mem.h" diff --git a/libavformat/samidec.c b/libavformat/samidec.c index 698164b6a2..0da299343d 100644 --- a/libavformat/samidec.c +++ b/libavformat/samidec.c @@ -27,10 +27,8 @@ #include "avformat.h" #include "internal.h" #include "subtitles.h" -#include "libavcodec/internal.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" -#include "libavutil/intreadwrite.h" typedef struct { FFDemuxSubtitlesQueue q; diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c index bcd103bd86..e3a950fce3 100644 --- a/libavformat/subviewerdec.c +++ b/libavformat/subviewerdec.c @@ -28,7 +28,6 @@ #include "internal.h" #include "subtitles.h" #include "avio_internal.h" -#include "libavcodec/internal.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/intreadwrite.h"