From patchwork Tue Mar 22 12:35:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671282uaj; Tue, 22 Mar 2022 05:35:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTN2fk3sqfp1rTaDHGtVgabRV12hNTUlvLQM5S5vtNhdSs39hw5INqq2R7UCkgBB2LdwPv X-Received: by 2002:a05:6402:528e:b0:407:80ff:6eed with SMTP id en14-20020a056402528e00b0040780ff6eedmr28435692edb.165.1647952545674; Tue, 22 Mar 2022 05:35:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 26-20020a17090600da00b006df76385c0csi9755933eji.172.2022.03.22.05.35.45; Tue, 22 Mar 2022 05:35:45 -0700 (PDT) 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=qNBHbCIP; 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 BA42D68B1D3; Tue, 22 Mar 2022 14:35:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073019.outbound.protection.outlook.com [40.92.73.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1075068B1C1 for ; Tue, 22 Mar 2022 14:35:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMsTc/mQvtyAMHR8X1olHZtihZDbLcYleEy7y+l/KNAyC/aQjMSt73r7M9z4NWvR7FthylTAfLemGXf+/QScMmHZVyNwzbCmpHTaX8PON8zvZAoC+Ws8/PvH8KGFEDVEhUxa19+0BXwhGXIwKDBEeSs037I/RgnL1SGYOCNLwZrnv+Wnp/dK3B8SL5WcV/SGqOj3WCOlh1ZyvM/uhJT0O/rcKVGSzIGXgsjty41Fdg5aMSBofnNiozG9YjIjeYJZVZh9OO+OEa2ExbmLu0ofCptH9zAFTFRuC9d2HU8JWW0ZYiW4IAg/Xokf8P7r/XR1B3DAkx7/s3z8qydvFjKC0g== 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=I+xu+70YglZ5ri5vXh1O9TrXUyioLpDxRlNOjI15o0w=; b=RYesRUkC9PWq64Y9qsXAeOsASln3N5uVj9M2HjaQQrLDJRHN3vc79qvLGuSfWsSVf2kG0X0QMMmbeI/XWs3k35D4DffO47hLmgmqF4Y0e3YBCKj2G6phfam6mUVRPCBD1dAe07+wGm/0l9T1NIuBgkp871PBsZTzKYyrZG8XSpQgpgxkVeoXMsWyZtwU+IIL9bRyFCOBaFKYaTUl2iGlhUllRXlG7j9RxAnHqb0rBMSXDrM66q+nLC3KnDpx/Z1aOVUi0vUlYhhcdxgoLS0nk509C9FreZ1BWL8uy/hQpwwYbGM/LIBoZj5+WnSILnCiGhNTloLWhvk9H/59PTDcIA== 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=I+xu+70YglZ5ri5vXh1O9TrXUyioLpDxRlNOjI15o0w=; b=qNBHbCIP1eDEd2hlyj0Skv9aG6ipVFwfMhKD86WMGrVR0dqJBcegYHt/zF0PJjYiHdEbcmrTvLcuhcAzOhiTXZakrcqWEDk4D2EZ3x2VZEQ2JbTxZ4YCvcdVkj3Ed1YKHoS8x4x7RLRa4yvMMf8kTteNutXqIORk3CnZ7t6uzl8BJp1LuYWCz3G6NcjdPCV1LpVQ9xiviNcCatnwNyGhYkSDbubp6dAqfdP48WLOJ8QbP5EZmMZFn0beWi2mh8PC991yTIyIaxZfNufyOeM8X2BGFylUmSOCMjJUFHkbN4DtewromML948DcsfGWU3oE0gESxUXQpbJwfrQqCwyiLg== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB4717.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.18; Tue, 22 Mar 2022 12:35:21 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Tue, 22 Mar 2022 12:35:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:35:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [t763zaZwjH8KEzs16HyjO8tMPajfFiLs] X-ClientProxiedBy: AM6PR10CA0068.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::45) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123511.368793-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d75d747d-c91b-473f-f7a4-08da0c006dff X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuR8JRu/bs3HbiLUZ4BkXFvYcqTM4AdjhKSLC5C7NjznxZbfYzoX7nOuDR+Aleh5vXW76V4SFnsXsoydUxeT6SjxRe31UqB2Do2FPtmV70zkqIn6Y+K95MMev72GcIvxAwYfFhu/1J2lF5PcZoi50c+zogjtQYrCkVNXzK/oTRrJ5Vo/wsKBTPT7GB1fYuAsnNE8a1YSUYp9pR1gA6JhFxpNwSoDgfOoQe234Kq9sFNbBotBCyYGX1sjPn9jhkkb9uJPhHNeFIxzvrvm0fv+fpzuhCDhvlt6zdyxZTjctHUKM3cxh8hj7lYk9pGKw5E9n9xYB+oM0/7A0F2SjWOs1gEKX6KwbBR/uyHGCCLohEgh564PqQclKA0i3H/R66NlsiFUC0f8xnJ7AdhdRB8UWRluq066P3du887lMlaT8oOYXWoxFD9oA4AoM6qQUDMoahQ9NsfCukEG00BaIC+MPu9rk3liOhOSv1fRuzk734xcN2ilEiCaH6eUHlQNCRoRXh2rYQzaNU3zN3I/CN24nFuqbYUkLBVSO/Y/1N9xLEKodrsOBKi3Iu5Axg7LZDC5Zkt6wc83KXb1UpLmPVdW2YjAPT0kECD5Ood09t5Bhcl0oNrA8Z6H/bxDuyeEqkMTq1bFswx60usoUCaX4iKPgMK1y8RrO58hbaE6Z2Y5LdUAobnAl+ihrREWSSuzJSnzx7+/F+Cas4ORnGZ24bsIgh9YOAjo9rHQz882YQ5iA9PfD7CYwpwA7rROpq4rvg4ovtjiBNv9g9VfTxXtyaUG9t6 X-MS-TrafficTypeDiagnostic: VI1PR01MB4717:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3vLqOPDgEikiQ3EMnP7pfIOWtZt/LRP8h1RHsf9ggEPE25IU/zeac3n1hecp55Q8DptlxyWTXjPDg5iHy9quYI15NRSEUw60Jz/oTlefR38Whf+Zk+XvtFdGbFaRoY2EQZvwcssENe4FHR89ggNvuvePOcVIb7UGUeVfgpZuyxSqBgvNmiMXa9ng0L1ceil0/zbRmByt2r9s4Wy3kzDG/u4881AYw3+jrJfI6D7jLHPTUOoXC+E/G/4ZU91qml0lmwSusYZTbfSyML5EmEOUIAuMgSkPTHrp9D7CkLGUU9EiTzNIAwub/x7BBj9drrdfduPTWaaUcrGLu1CrdNdInWhf4NPPxVH9fZaAsSqPBG6IBzPf17i1i07OEqOqFEPOlkj9oguJPJ4qONXCa5xbjeB0hJhb7Dbtp8ayuwPvsoibDqUD7H0PGxy0sn4oLiJWLjmtMG/3SH2HIUc+ZSao/9fNXqEPmOW0b+hfymPpNcvEpvEyocFwU52aN9C4CK6YsG/pi91jIIgLDA9L1TS+jRQOEzVY4Fa4EcENjRQpdGn/xqb6Msgjga/aNORT/3rOBn5i2Op/8E5vjqEoRUyShnVfb7ZhrCBYHGKroSSg5s/0KwCL7cWTWTGgEHUaic2LDi+/K0P1pO5r7gCN/nlTHw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xDgeBYJkhVAtQBm58UI8DXRkZRRfxNaNMGPsevvNXSa5lJt3hA6NQN7oTGd2c8SwrWxPgoYcrivWUH3ghu9z3i6wdTMM7Z5CtIU0ei74rgon5g8mm+LzEtvh37kN5T9X4oSeRpW+lmEhXcOptJtSFkr0pkQy2PBwws6Wu1GQTngFgp+3wWrcNtFI4FU9+kxHLY2AMNX2jy8N5zElz60v5Ei2BwGZw0zmq6qIDZQX1KXNZL1Cwixxp2Lqxlt5Ix3mnodNqDQEUiaBkLWQ2QHFQ1kUeUlAU+FKehSiBDm+8XmciMWk6y+L3LC0x6CdCEADquIhOYLV9+0fyNLSNoMELAH8OYawvKeACC+/fFg+iPPAJb4jBdMOCdoP8XSiBlzXBG/7FwweCeJGLeqYzs+gzhtUA8Y1jsx+mhWfkxo2im0aHhkDTRY1aGEfM2RWMALa8CoMDS6udI8iSdJ9Tp0I4wdsykkYlA27T3yh6oTTvON6L3FmPzWVsdfPrRBKIBMDgJyABV55s9oUK4d3OO6zafu7stzVpzY0y6tXqzhJxAeJQrtnTidHfg3rcYl0+zgwN3izleA+lPm6nEHX7+DER1LhxUBbEfDsTDomfZeL7587DVyH3J9H3ZsaEvYL+xx+qqMcue/bTBzEXehaoqE9tXhFknxw+jXZPu7faSSSMZG1265IzFTXKxKKSC+hPCQdJxj8NvLzQyzhypjsUgVm4uhRdB5cBoG5VhqFt/3LemQr5ZhjGzS2Rzm14Hx7K46/MIzg1Rz9q3/IiNCqaVdKAnTleHDnoOx0iIxfgoTTo89tczMI3HKuZ/GV3finmtXbcbP099Dmyxs0ve3P5LD/l6TT9WrRNqZYlsmfcb6oOnnb4g2K54RZSbKDBxs00GuhN1QKtkvgIOme2B9rPOS3mct75TiH/8+3G+g1fXXeK9PxbkzsyLZP/TuCYL+SwotJNRW2dypqbsmHxlCae+9mq8xOPMKMyQfYgvN68freL0S44ah18WFX6Iv3PKiJQ1lgkgNQ96O9U3TcDCBBz13Uf0Z64WiQs62xE18qp89HDt5W1oC+tYRYByE+fcwLTYl3mtykmiSQPbwdCA3VPNUTKsGzaZ233OLmyoGgxfcRwaH3tpQlFK4/UNd83xSE/AtjO9oSsRUrLP18EAh9M9/wHGHwkYhKw48MHlo/kvEnyg8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d75d747d-c91b-473f-f7a4-08da0c006dff X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:35:21.3570 (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: VI1PR01MB4717 Subject: [FFmpeg-devel] [PATCH 6/6] avformat: Remove unnecessary inclusions from libavcodec 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: BZwu0Qw43Iy5 Also improve the other headers a bit while at it. Signed-off-by: Andreas Rheinhardt --- libavformat/a64.c | 2 +- libavformat/act.c | 3 ++- libavformat/apngenc.c | 2 -- libavformat/av1.c | 2 +- libavformat/flacenc.h | 5 ++--- libavformat/flvdec.c | 5 ++--- libavformat/frmdec.c | 1 - libavformat/gxf.c | 1 - libavformat/h261dec.c | 2 +- libavformat/hls.c | 1 + libavformat/hls_sample_encryption.c | 1 + libavformat/hls_sample_encryption.h | 5 +++-- libavformat/icodec.c | 1 - libavformat/oggparseskeleton.c | 2 +- libavformat/oggparsespeex.c | 7 +------ libavformat/rsd.c | 1 - libavformat/rtpdec_dv.c | 4 +--- libavformat/rtpdec_hevc.c | 2 -- libavformat/rtpdec_vp8.c | 4 ++-- 19 files changed, 19 insertions(+), 32 deletions(-) diff --git a/libavformat/a64.c b/libavformat/a64.c index 6e19162fe2..a66f2542b7 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "rawenc.h" diff --git a/libavformat/act.c b/libavformat/act.c index fba106c520..6dd9f62a87 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -18,11 +18,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio_internal.h" #include "riff.h" #include "internal.h" -#include "libavcodec/get_bits.h" #define CHUNK_SIZE 512 #define RIFF_TAG MKTAG('R','I','F','F') diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 767074ecf3..88d4a41462 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -22,14 +22,12 @@ */ #include "avformat.h" -#include "internal.h" #include "libavutil/avassert.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavcodec/png.h" -#include "libavcodec/apng.h" typedef struct APNGMuxContext { AVClass *class; diff --git a/libavformat/av1.c b/libavformat/av1.c index 7caea0c377..79065d0c9f 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -23,7 +23,7 @@ #include "libavutil/mem.h" #include "libavcodec/av1.h" #include "libavcodec/av1_parse.h" -#include "libavcodec/profiles.h" +#include "libavcodec/avcodec.h" #include "libavcodec/put_bits.h" #include "av1.h" #include "avio.h" diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index b308d0d021..02937b240d 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -22,9 +22,8 @@ #ifndef AVFORMAT_FLACENC_H #define AVFORMAT_FLACENC_H -#include "libavcodec/flac.h" -#include "libavcodec/bytestream.h" -#include "avformat.h" +#include +#include "avio.h" int ff_flac_write_header(AVIOContext *pb, const uint8_t *extradata, int extradata_size, int last_block); diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index cb24b1cc26..0c90748422 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -24,18 +24,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/dict.h" #include "libavutil/opt.h" #include "libavutil/internal.h" #include "libavutil/intfloat.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libavutil/time_internal.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "internal.h" -#include "avio_internal.h" #include "flv.h" #define VALIDATE_INDEX_TS_THRESH 2500 diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c index 478656b037..e6c1179dcd 100644 --- a/libavformat/frmdec.c +++ b/libavformat/frmdec.c @@ -24,7 +24,6 @@ * Megalux Frame demuxer */ -#include "libavcodec/raw.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avformat.h" diff --git a/libavformat/gxf.c b/libavformat/gxf.c index d96e0796f4..e61291382a 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -26,7 +26,6 @@ #include "avformat.h" #include "internal.h" #include "gxf.h" -#include "libavcodec/mpeg12data.h" struct gxf_stream_info { int64_t first_field; diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index b5161ff57d..0fca1a340a 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/get_bits.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" diff --git a/libavformat/hls.c b/libavformat/hls.c index 0541d3c610..83ff4cc607 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -30,6 +30,7 @@ #include "config_components.h" #include "libavformat/http.h" +#include "libavutil/aes.h" #include "libavutil/avstring.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c index 159a6edc6e..08cdf964b6 100644 --- a/libavformat/hls_sample_encryption.c +++ b/libavformat/hls_sample_encryption.c @@ -26,6 +26,7 @@ * https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption */ +#include "libavutil/aes.h" #include "libavutil/channel_layout.h" #include "hls_sample_encryption.h" diff --git a/libavformat/hls_sample_encryption.h b/libavformat/hls_sample_encryption.h index ff3f9c22f7..d86eccb74c 100644 --- a/libavformat/hls_sample_encryption.h +++ b/libavformat/hls_sample_encryption.h @@ -29,12 +29,13 @@ #ifndef AVFORMAT_HLS_SAMPLE_ENCRYPTION_H #define AVFORMAT_HLS_SAMPLE_ENCRYPTION_H +#include #include +#include "libavcodec/codec_id.h" +#include "libavcodec/packet.h" #include "avformat.h" -#include "libavcodec/avcodec.h" -#include "libavutil/aes.h" #define HLS_MAX_ID3_TAGS_DATA_LEN 138 #define HLS_MAX_AUDIO_SETUP_DATA_LEN 10 diff --git a/libavformat/icodec.c b/libavformat/icodec.c index 2e677c78f1..290f658d0c 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -26,7 +26,6 @@ #include "libavutil/intreadwrite.h" #include "libavcodec/bytestream.h" -#include "libavcodec/bmp.h" #include "libavcodec/png.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index 532fa6aefa..2016b16c95 100644 --- a/libavformat/oggparseskeleton.c +++ b/libavformat/oggparseskeleton.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" #include "oggdec.h" diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 7d3d653384..d20d14fa41 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -22,13 +22,8 @@ DEALINGS IN THE SOFTWARE. **/ -#include - -#include "libavutil/bswap.h" -#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" - -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 65316f0219..c3b570da22 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bytestream.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio.h" diff --git a/libavformat/rtpdec_dv.c b/libavformat/rtpdec_dv.c index 53a5855ad3..fa75a77a84 100644 --- a/libavformat/rtpdec_dv.c +++ b/libavformat/rtpdec_dv.c @@ -21,10 +21,8 @@ #include "libavutil/avstring.h" -#include "libavcodec/bytestream.h" - #include "avio_internal.h" -#include "rtpdec_formats.h" +#include "rtpdec.h" struct PayloadContext { AVIOContext *buf; diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index f467104ca5..a739ed5bd2 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -21,8 +21,6 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" -#include "libavutil/base64.h" -#include "libavcodec/get_bits.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 360dd5c782..6701ad59f9 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -27,10 +27,10 @@ * @see http://tools.ietf.org/html/draft-ietf-payload-vp8-05 */ -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avio_internal.h" -#include "rtpdec_formats.h" +#include "rtpdec.h" struct PayloadContext { AVIOContext *data;