From patchwork Fri Feb 4 15:16:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp3493667iov; Fri, 4 Feb 2022 07:17:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnP5XQt44O4ciV3xbFqYr3uSB5WF1DjzN6wHQd0ENhG9xPE5ydNFf0GDrgDYyrnx7E3euQ X-Received: by 2002:aa7:cb17:: with SMTP id s23mr3564486edt.282.1643987872050; Fri, 04 Feb 2022 07:17:52 -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 u8si1398494eds.8.2022.02.04.07.17.51; Fri, 04 Feb 2022 07:17:52 -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=OAQ3D7UI; 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 87A9768B2A4; Fri, 4 Feb 2022 17:17:17 +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 5E74468B297 for ; Fri, 4 Feb 2022 17:17:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mB5lNGh7gnefLEytczC3mIyQFUny6Yaq5BJo2i10OfmCDpYcozWFyWZPxOmvxWIzjmoZthTya6DJNaqX8TqZUnROFK4gKDIJNooJRet+Y0zyiHpCDjhrYE9fVFRJl3EuehhotpfeSMbVQ7FboQHTi7SMWDoocDJ3x7B4yFRXCGnVaKISIf62+jwvQ8BMyFllnrVBUBjQp9wb6ejLeVKj/lfpxwH0/MwdVcsBQC3iU7Orup9mMz8oMD661u3wD1osVgZ+SDbPfehmxCTqbVnYdTOQkDsmwkwhS86ex+adQeV1L6pPcoPsL5I2nduzV0NU9MObjdATsgWi9RNvGxOWFQ== 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=UTJXa52lkDewAUa4aSZF2JcqznvSA0sGIV3RzaIGZlg=; b=NZoek7YO4LSP4WG0M+9OmcK+JTp2L5w2bIsoI8TYLxpLramFyC9oeYoKvuYjvXrV2f0eTvufDJIEzbman010uajX++B9EuKqn5xm1U7pCzttNWpYSLHoJj+SATRZTs/WLasQxarzJdSvZAmoGqx4mFfxbCwPh1UcOTfDnHutgamKJJ61gbD2DzUgmpauRgGYdfXBqfSu2+fdc6gUWm06AMcMQsWym7oHrX/7Sgr7RHTBqLi9eiZiik4kLHuttl0SnHDKYzDPv9sCDS0DzFTUtWPB31GRcaDl3X4IvW1xfVZaueB/iRA5niJOPqQaYITXhSTVUm/1fNTTJS/zIx8nog== 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=UTJXa52lkDewAUa4aSZF2JcqznvSA0sGIV3RzaIGZlg=; b=OAQ3D7UIkvDkTllsB2ROoj0jAK19uAyxDY7mkhVhnNfYGfeXJmVs5q9KetZm35s0uoEOZ4hquXWJOKHRMpxJr85k2HS1hUeT9eahvenXJG0s4fn57GzatI2PWpOB4UTDTH133viLRxPuesxaWBf+0FfQQu3dTyo4pzkSrSMayeHzIp9oo9Zah1xXvioj+syIUHq/Pell4MkRFpBIiRr5TqbzTGWRLgaDFPmwYd+nFWfVBOW/U9OYouFhzrFnCCFrQI1DcsNMwS/Orrx0mdaTgeailpMXX8PEPbChTwE1s2QkjS7tN3bYMyzznjko8Ln3vMI3lMZ2Jb6REw6iFx4y9Q== 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:17:00 +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:17:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Feb 2022 16:16:47 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [H+98irXNo96BxXlS7/FIKa+YASzbTikq] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1173529-143d-4778-61c8-08d9e7f1644f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSjtu7sMDnYCqklgc/dtjmmdKOFrrtb3v6Vhnj/KWPZQBSHA1JVl0g+g5wqu0HS71iG/RYpkr0JJoyVt9+TbgOiOKvuiExKq8KWtO/PyDYHzifHaT6TeDqWC+XtZFOSuSE1J3Yykq9VIHU2fqBFXX9MosoBuUilrCGQgcZt3qaZQoq2EemyJtijhtWCcqdr/oD6rDL+n69/WfDE5+bv3ocGPxetwif514iT2hvmFCrAH8hoirSzVFnRUZWvlsVnk+oOgMH6h6R0KcOTEx6/+T9J9+TWmBPH7pbDGZg7lQE+QQkN+j7NS2zEBWvXwe3pyTkiPRen//q+B89AWwWUITdXGLrOp033BQfy30m2zKOU6IL1GW1tZIZxLEZwt2VPveHND/IEEVnXlKdB9rPlujJxQakTzA0UbycoQqbC0stINwaRcTsu441uaTEBQ1D8oHMt6Wi+YZPJEn4p78JFFvq3JsSY9LMr/vNdBgXyptQsZte6CEkNKocvK9Dg0gy9MIatNk/HsqXKbarB6f2SRQEtzvjXoZNXKrtu/4VYiNDOiPRUKvaWBuLluxLiR83HR/sJSSDsPA9BwxN70RcC6/gkr8SMgGrc01uoN2OWMa2Hj3GObzfPGdIHQ0CpqDg1o4DD2LbW+lUb+BZyRyCd8mkF7K5F2US+IMle6YiEQhUSxJgdYGEtwijpPTtzywoX7fGrXXDFdQkmwt6k0/17A92G0KPsILlBYPHeBuZbvAO6zJWHjjLYgP9LtBhktlFMD/8= X-MS-TrafficTypeDiagnostic: VI1PR03MB4703:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pq2IQsBDiwWmCopAbZDrsoM/gLPWaJ+juCZ71WLp+38BjuxK+ct8GwrxeECSp5kX6OxDL4VNQX2EO3xZSUBMuZ2DgIwOwxzTsnEkVr2bZkTWiEG7tZYVdHUKpSeOuIMc4w8eBYis17rb8ic/d0IzzCy4K2W3HPxl8gwY0p3BpCDUFRoQvDDgYgEn4h+EU760/9ytgCY+rZF28c1Bc8sS1DAf/nFwu2S9wofrQ1/LwDSaXylSlVK5f+XIQnzNrbFOG8+dJMv2+Rme380RbvnkOGPHKL8qwXI1FIeDM5olKisedGjAq7PKXdjpTI+PI/3NADF1t0tSF2szLNPQxHwARlG25/7BkLHeWD2RqnuDLHsLAOPWzNqzZ17ZCoKswqlKFRsRxYGkYkfRo6/DW0HvhveHLHBD0e1drgAdvuMUph74IpPacA0y1rhZ6jcfzL78ewjXTnPKqnkXeBfVM9+DFeqqmomWV/yda46W+GKVvaUrW8uqDPPPXC1Ws/5BG2kiCTyliOKQlD+tq6E9ij/Nus57ds5k7U7tuJc+cg0JdyUydtq/lK4Pig2z+VSXnShvV7+dRHRqqnY+lL1HPYRigA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5ALAHQHK0JiPGGP9A5zGSNcjs6dEHISp+IDyEFdKLEBGKT2f5N2is8JUfjrpZMMuv6BhaPiQ3AXOj6oACc256qxF37jG4H9+Do8C25U/S0KcXTaits/EnDLIUYJGfWccriMHoQIdZ7ZjZmdcTLxwe/2z8r06xd1foKf8S4t/Nv1kErt1/HtRDZEEIj6Br5oxz3/vhaqel6e6p8K2cmt0j3OfPSyzpEmkyWdYUdetE7uTqcVJL18Tsz51FQ3co+5CDOU5Xq6rifL16DJheSP2N0ESM41PJxKiP0juyMGQ40j8sopv4WW0kTWZR98X+nX7lw+sal7qChFE+M6ukGDhX3UeGd+ZXUfpvxohKLJdq6xP5egDCXCzWcS+64kp/n4P7Y5J3HnX6jZBtchcEwnYHGpvYL8qnRqwVlJMq39HMJBrEvshBSm6Qt/dCzebYJYXuVhdxwtbGWxb+w5k6H974MrIzvN+nhL8NxqEcT1isCwS8zLoPjPwhR2O9F3HkTmIE242uGmHOOV0P/xNrZbVYlBdeCPK1f1R5joKQRQGr/bN3hcz+mlN+vXorkMNwMVYu70uhNQSwZpf1g0b6u4zrL8UaoX1lH+ydQNRXkQpMSm3ghkLzHeE9yZrFZxRP3t8vz1DZc5yYbyjiNzejn2w04fBpYjWzDDLIF2y/eh4B9yuwM5xylIQhfyu8BduN2v0VM/gSUtqz0Hc/OTlktfkXnRinMCmKAucNNGIMMRrJ5Jytiva3g/MnafnIGDNfZYDR3skbjOrV1rUmX5cvKEkjAfO8v8Eb4qRK4skyL2XAJgkMibvc35AXeaHsJQ7QCmbFRWTmSbHk9Ce6fI9VlsmWBUf5a34xQA0A++vfJL8G1LlAadcfM38TRiK5VAvs3K8g6fCfOiJXaHCVwFpvlPCOdQU/sKQf0FGdTIw57Ticry37jQq1RvOgoJdJWqlqSyC6a2t3PQgt9PVRJjf6T0tfw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1173529-143d-4778-61c8-08d9e7f1644f 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:17:00.8194 (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 6/7] avcodec/internal.h: Move avpriv_find_start_code() to startcode.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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OoI0nzZRnW9T This is by definition the appropriate place for it. Remove all the now unnecessary libavcodec/internal.h inclusions; also remove other unnecessary headers from the affected files. Signed-off-by: Andreas Rheinhardt --- libavcodec/cavsdec.c | 1 + libavcodec/cbs_mpeg2.c | 2 +- libavcodec/extract_extradata_bsf.c | 3 +-- libavcodec/h264_parser.c | 3 +-- libavcodec/internal.h | 4 ---- libavcodec/mpeg12.c | 6 +----- libavcodec/mpeg12dec.c | 4 +--- libavcodec/mpeg4_unpack_bframes_bsf.c | 2 +- libavcodec/mpegvideo_parser.c | 2 +- libavcodec/remove_extradata_bsf.c | 2 +- libavcodec/startcode.h | 4 ++++ libavcodec/utils.c | 6 +----- libavcodec/vc1_common.h | 2 +- libavformat/avidec.c | 2 +- libavformat/avs2dec.c | 2 +- libavformat/avs3dec.c | 2 +- libavformat/cavsvideodec.c | 2 +- libavformat/mpegtsenc.c | 2 +- libavformat/mpegvideodec.c | 2 +- libavformat/mxfenc.c | 6 ++---- libavformat/rtpenc_mpv.c | 2 +- 21 files changed, 24 insertions(+), 37 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 692c77eb39..894aa1b54a 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -32,6 +32,7 @@ #include "cavs.h" #include "internal.h" #include "mpeg12data.h" +#include "startcode.h" static const uint8_t mv_scan[4] = { MV_FWD_X0, MV_FWD_X1, diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 90d667ddc8..8d45d1ceeb 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -21,7 +21,7 @@ #include "cbs.h" #include "cbs_internal.h" #include "cbs_mpeg2.h" -#include "internal.h" +#include "startcode.h" #define HEADER(name) do { \ diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index dbcb8508b0..027a578af1 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -18,8 +18,6 @@ #include -#include "libavutil/common.h" -#include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -31,6 +29,7 @@ #include "h2645_parse.h" #include "h264.h" #include "hevc.h" +#include "startcode.h" #include "vc1_common.h" typedef struct ExtractExtradataContext { diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 4002bcad77..50810f1789 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -27,7 +27,6 @@ #define UNCHECKED_BITSTREAM_READER 1 -#include #include #include "libavutil/avutil.h" @@ -46,9 +45,9 @@ #include "h264_ps.h" #include "h2645_parse.h" #include "h264data.h" -#include "internal.h" #include "mpegutils.h" #include "parser.h" +#include "startcode.h" typedef struct H264ParseContext { ParseContext pc; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 72ca1553f6..57a1c6206f 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -285,10 +285,6 @@ int ff_thread_can_start_frame(AVCodecContext *avctx); int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); -const uint8_t *avpriv_find_start_code(const uint8_t *p, - const uint8_t *end, - uint32_t *state); - int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec); /** diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 58e03c05d4..5520960b74 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -29,18 +29,14 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/timecode.h" #include "libavutil/thread.h" -#include "internal.h" #include "avcodec.h" #include "mpegvideo.h" -#include "error_resilience.h" #include "mpeg12.h" #include "mpeg12data.h" #include "mpegvideodata.h" -#include "bytestream.h" -#include "thread.h" +#include "startcode.h" static const uint8_t table_mb_ptype[7][2] = { { 3, 5 }, // 0x01 MB_INTRA diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 4a7bd6d466..860e86aa74 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -34,14 +34,11 @@ #include "libavutil/mem_internal.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" -#include "libavutil/video_enc_params.h" #include "avcodec.h" -#include "bytestream.h" #include "error_resilience.h" #include "hwconfig.h" #include "idctdsp.h" -#include "internal.h" #include "mpeg_er.h" #include "mpeg12.h" #include "mpeg12data.h" @@ -49,6 +46,7 @@ #include "mpegvideo.h" #include "mpegvideodata.h" #include "profiles.h" +#include "startcode.h" #include "thread.h" #include "xvmc_internal.h" diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/mpeg4_unpack_bframes_bsf.c index 6f8595713d..ae2c129d88 100644 --- a/libavcodec/mpeg4_unpack_bframes_bsf.c +++ b/libavcodec/mpeg4_unpack_bframes_bsf.c @@ -21,8 +21,8 @@ #include "bsf.h" #include "bsf_internal.h" -#include "internal.h" #include "mpeg4video.h" +#include "startcode.h" typedef struct UnpackBFramesBSFContext { AVBufferRef *b_frame_ref; diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index c5dc867d24..22666c85d9 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -23,7 +23,7 @@ #include "parser.h" #include "mpeg12.h" #include "mpeg12data.h" -#include "internal.h" +#include "startcode.h" struct MpvParseContext { ParseContext pc; diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/remove_extradata_bsf.c index 1d5f193f89..c698d1d7f9 100644 --- a/libavcodec/remove_extradata_bsf.c +++ b/libavcodec/remove_extradata_bsf.c @@ -26,7 +26,7 @@ #include "bsf_internal.h" #include "h264.h" #include "hevc.h" -#include "internal.h" +#include "startcode.h" #include "vc1_common.h" enum RemoveFreq { diff --git a/libavcodec/startcode.h b/libavcodec/startcode.h index cfa02b0860..8b75832aaf 100644 --- a/libavcodec/startcode.h +++ b/libavcodec/startcode.h @@ -27,6 +27,10 @@ #include +const uint8_t *avpriv_find_start_code(const uint8_t *p, + const uint8_t *end, + uint32_t *state); + int ff_startcode_find_candidate_c(const uint8_t *buf, int size); #endif /* AVCODEC_STARTCODE_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b19befef21..c7c7323351 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/avassert.h" -#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" @@ -40,12 +39,9 @@ #include "thread.h" #include "internal.h" #include "put_bits.h" -#include "raw.h" +#include "startcode.h" #include -#include -#include #include -#include void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) { diff --git a/libavcodec/vc1_common.h b/libavcodec/vc1_common.h index b46c33f7e2..c0f0c8c2eb 100644 --- a/libavcodec/vc1_common.h +++ b/libavcodec/vc1_common.h @@ -26,7 +26,7 @@ #include #include "libavutil/attributes.h" -#include "internal.h" +#include "startcode.h" /** Markers used in VC-1 AP frame data */ //@{ diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 86f857b1e3..0f0e6846da 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -36,7 +36,7 @@ #include "riff.h" #include "libavcodec/bytestream.h" #include "libavcodec/exif.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" typedef struct AVIStream { int64_t frame_offset; /* current frame (video) or byte (audio) counter diff --git a/libavformat/avs2dec.c b/libavformat/avs2dec.c index 51908d2b63..0d5b23b65e 100644 --- a/libavformat/avs2dec.c +++ b/libavformat/avs2dec.c @@ -22,7 +22,7 @@ #include "avformat.h" #include "rawdec.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "libavutil/intreadwrite.h" #define AVS2_ISSQH(x) ((x) == 0xB0) diff --git a/libavformat/avs3dec.c b/libavformat/avs3dec.c index 253caa7c1d..2395df171b 100644 --- a/libavformat/avs3dec.c +++ b/libavformat/avs3dec.c @@ -22,7 +22,7 @@ */ #include "libavcodec/avs3.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "rawdec.h" diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index 8900b97597..1fa3aa5e92 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/startcode.h" #include "avformat.h" #include "rawdec.h" -#include "libavcodec/internal.h" #define CAVS_SEQ_START_CODE 0x000001b0 #define CAVS_PIC_I_START_CODE 0x000001b3 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 92b4cc8087..971b3f55d8 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -28,7 +28,7 @@ #include "libavutil/opt.h" #include "libavcodec/ac3_parser_internal.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index 2d6f81aaa1..33c5d79794 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -24,7 +24,7 @@ #include "rawdec.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #define SEQ_START_CODE 0x000001b3 #define GOP_START_CODE 0x000001b8 diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 5e068c8220..1e87dc6111 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -48,12 +48,10 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" -#include "libavcodec/bytestream.h" -#include "libavcodec/dv_profile.h" -#include "libavcodec/h264_ps.h" #include "libavcodec/golomb.h" -#include "libavcodec/internal.h" +#include "libavcodec/h264.h" #include "libavcodec/packet_internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c index 4b45f51772..c18c75082f 100644 --- a/libavformat/rtpenc_mpv.c +++ b/libavformat/rtpenc_mpv.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "rtpenc.h"