From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6571A473F9 for ; Thu, 7 Sep 2023 01:06:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D37468C893; Thu, 7 Sep 2023 04:05:40 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2042.outbound.protection.outlook.com [40.92.59.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D624368C7FD for ; Thu, 7 Sep 2023 04:05:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MQ+sK8WWPoMrwcDjSqy7l9+BFDOpfbo7LBh2MQ0k/0NeXv7YY7uFKqILMQ03kD4qSeNx464XNWmiXCAJpgaTEaZWLuKTNoXz31+x/h3fwmORfDf0d8cXGufs9r16FX6ocexesxHfh6C82y3luARysf52gTjxAPuNw+ugIbNGs1ryfih3JFvA3vU47ejqagADOVvm4Xadads8vZIf6m0CrbxaUmRNNV4FG4YQi9nGGOO6WuZFSv+pAb7fQYtFA1gHxvAvQ1Mn2D9R+NhL7SE6q8FPrhxQFTV7Gl3KYudmW3pK9rM9pCdpzAzbU+0pnXjdeCeG6skNgkktu8T9Mip1HA== 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=BjoMzrurbD3QTMWP/8jzBQ0vzV1WD44LVIfmmej0xQY=; b=f4uPHYBkv1sF5vAAki5mBfX+8pGKC51eLDoM27BQfgvK4KKpHL0Sf9TKIbO2YygyYwIxuntnVlaMyPSzs6Or+29EnTurTcDj47e8/wPBXEpWc8stMcvK7eewOWJXNUgy+2NkDSzYifw2tooMVw7VJaEhzaNQODog1iX/3qGocD714/NAebpWfQ9Hf6U9OZuWurFPZISlaZLd4qGO8L4RCRxbawKZEUIbJ7QkCXr6i7VpuLaQ+RvQn4D48EUW9X0Db5RuIhdVnPrtnUOF6l7UvrIXLF6anjhxIYMIGrzU/CZTBjAu9j7Aof8sfhzpXGqAGYzsnzbNOMRYh+4andLw4Q== 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=BjoMzrurbD3QTMWP/8jzBQ0vzV1WD44LVIfmmej0xQY=; b=PM/KWB4NejhDYucmTzA18tP2wL1UaVJKX3OGCtfzgkapJBlcQyls3a5iOqpSHKxVJuUhOLlsS7OMKIqED1u8iABRlAnpjJdMXEpo544lrmqXWdtGospuDt0G+VlHnmRtpIkwseDgV/dwv9fbl9O3X261wr6/VtipK/vMJ4FNawlxiTc4nQdV0L9VLX4TKlSPDlq+V3D3IsMR/wSNWRFOmg460slWxxiAqRHxl1VekkSGumjl5JXHtgxnqqmqkqi0QbYeIOca+jZnu9b+DQAb8BUewz0n9ifrkY72MGetgJiHjyGb/vqa6EWApP4QNDGX2AnNIWDLEQ6o99Wh5NkIMA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:05:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:05:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xhVSlh9SFY25KzFKnlFcCUXiZAP5KOEQ] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010538.488975-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: 295b4ee6-3547-416a-db30-08dbaf3e8bc1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S3gOhfRBKgV2JgH5au7wlgljYZ+oQ6C5//7M1p34N7M/yXIEKd9z7QOO46S0GCXbycNfmkkBs0WG9vsLgVRe4b6myUNZBmkjD75bgyk7Q673XT02mDaGLbre0Hxqfj9sqENN3VfAnWn0uKQoHvoomdNNI1j5rFfSF6VA8Q9lqAGnw9+X6oYtnq3D4Dkn9JjImB+SY3bH7v4BFMkJ1XeV9Al3Hsj3v2G6f8ebzQzNWAKSHC5frlqeiXVytgqeVtxuLD/UumJuaKUTi7UkpiB7Io0Sw3SEBoXiw7hsvJTliHoRVwSgk5gv8HD/K1QnD1DRAjgvSLqIuzWIHQL6b0eCpwcRuAgEFvT7f2XdJ2T/WJnEDLVxyHqSBgjep64RgWWJYdLhq1oyPZD3fJ6nJYrMvTbBMAChdJxOTPWxlGarQqUtSK9ALSpdX090JqwnxbfTUfsKXcQmETcvHbf0pjZ9ihZ3AKFN/jHh+zZqYuEnKuMWGE65pKHV9PvVc1sU502iklai41w488z9Tgx7JXq4ljTkmb1QDJvQvV47c3Qla+PAEe6Y/jwaAgD0VRFwEHwy40BUNucVAP2tVa49AxTrrpUqbmBAaO+92FQ50wSCuMTvEn4ZxVjWQDrVbXU+BcQ5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uhuwWpa6iBH4M8DpiLzX0QbEllqK4rXix+NkfL+TUk5V2QnuflCiJ0RVfHiP?= =?us-ascii?Q?fy484Tg7F+1fGTVV5KORzWAZ9OE1CvBQ3chIVGuu9pFV5SFaKspScK2+HocX?= =?us-ascii?Q?ZRB1LGJ5nhUg1wsRlqvrBzb85FivxlrzFlm1qH9fDAtPW7h/23N7o7lfKLDc?= =?us-ascii?Q?1q+WmhWevFGuklivOcWoKw6WwVeCpqh0e49Kt7Opao621y4UTqfFdBxquzEm?= =?us-ascii?Q?Tbp1Ik+M0JrbKjGe43na2yDRC1rOrQJrRgbFq/7MuTUxos7bB2YRGGdrblt6?= =?us-ascii?Q?1xVERvXXxEGVeJCj4OOuy+FCah5NBdwdJFRX8FXkERJynW8q7uIWmkirI85h?= =?us-ascii?Q?c7PWzGMVm748Sbz2T54yqDemXxapzZXBdiRNKECtHUeWKBF/+iywPqx8oHrw?= =?us-ascii?Q?nFuvU8yGgcbBavUYc/SGo5CG07qWgJ1wete6STJbIiTSHJgb9yOFHhK1P4xc?= =?us-ascii?Q?baD6rRb0a9d4WLIlJr2DuXc7lbvKMQQYJkfYEZIrgco9L6GO6nbQriDZsG48?= =?us-ascii?Q?5blyKBDY+sOBN3FE/b240PMVMY77hds0tg4aKuTZRXjQisJrmmfnzMnEMSTv?= =?us-ascii?Q?TCxLJfl+fI2+pZ+J41B+I0vx+yD7m7da6uXOSt/Aj2Y5M4wPwDiHh2VS2pnK?= =?us-ascii?Q?MGZyGx6DXXx45UEZuw+r1T7pIqz1aHAW/q3n8L2DyxWhGJXGX5ASdyBLQgoL?= =?us-ascii?Q?nfX0XSYW+BbEe/3I4asSIfxVBm62whE25wPJVV4FjvArMhobrVTVuwa0nIRz?= =?us-ascii?Q?PWka5bkcikCmvJlIY61WIa03TMqKHjF5cRXCZ4IQ+WER446pe/XGsbnzYOne?= =?us-ascii?Q?MepK3Ee8sOVCAPQ6AFwo977yeJ7xRf5X5u6eQ5EinsmAdfSq9nAckjKj8qPv?= =?us-ascii?Q?kVifBNsF3jTRq11GGQqQ/WrrYdki99lWTxOBrouIDZyAe0OweSy1Cyn4ir+q?= =?us-ascii?Q?XjVwl4fpCOaBkQB5BDR64+BWn9Vz2iXJrrNJFHs3w7LJE2WbXf1Fk3YSNpRs?= =?us-ascii?Q?q9LLMwUMQRpa99VFYrN9ttuWdL+M6yYYX4QIx6P1l42sMmW0t9GNIcRBmGh6?= =?us-ascii?Q?L043jxx3Bc2zsGFqZv66GUB6uSAk1s6NCM/hia9U5+IH3owyAbn0QpJodCmn?= =?us-ascii?Q?4OgvjBwiUvhC18uzzJ+CbXVopzQMBwAmSB4/kXqTaYsUGUcSw3bqFVCtPU9E?= =?us-ascii?Q?uCqcH6/spLJc2U+b0MxeG6CjDLY2qhT3sliF+sp+ir5bjXyQnflxEwGCS0qc?= =?us-ascii?Q?N4oLYCr5czJgt9ZNseS3?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 295b4ee6-3547-416a-db30-08dbaf3e8bc1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:05:37.3025 (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: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH v2 12/22] avformat: Remove avformat and avio headers from protocols 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavformat/avio.c | 1 - libavformat/bluray.c | 1 - libavformat/concat.c | 4 +++- libavformat/crypto.c | 2 -- libavformat/hlsproto.c | 1 - libavformat/httpauth.c | 1 - libavformat/libsmbclient.c | 2 -- libavformat/md5proto.c | 1 - libavformat/rtpproto.c | 1 - libavformat/srtpproto.c | 2 -- libavformat/subfile.c | 1 - libavformat/teeproto.c | 9 +++++++-- libavformat/udp.c | 2 -- libavformat/url.c | 6 ++++-- 14 files changed, 14 insertions(+), 20 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index fd40f9ce43..5e1acba31b 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -25,7 +25,6 @@ #include "libavutil/time.h" #include "libavutil/avassert.h" #include "os_support.h" -#include "avformat.h" #include "internal.h" #if CONFIG_NETWORK #include "network.h" diff --git a/libavformat/bluray.c b/libavformat/bluray.c index 635c4f1b87..1845551c34 100644 --- a/libavformat/bluray.c +++ b/libavformat/bluray.c @@ -23,7 +23,6 @@ #include #include "libavutil/avstring.h" -#include "libavformat/avformat.h" #include "libavformat/url.h" #include "libavutil/opt.h" diff --git a/libavformat/concat.c b/libavformat/concat.c index 825e43a7fa..e1d57de557 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -21,13 +21,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "config_components.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/error.h" #include "libavutil/mem.h" -#include "avformat.h" #include "avio_internal.h" #include "url.h" diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 1d4514e0f2..75b00020bc 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -19,11 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avformat.h" #include "libavutil/aes.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" -#include "internal.h" #include "url.h" // encourage reads of 4096 bytes - 1 block is always retained. diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 6a2765bbe9..4db61dee30 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -27,7 +27,6 @@ #include "libavutil/avstring.h" #include "libavutil/time.h" -#include "avformat.h" #include "avio_internal.h" #include "internal.h" #include "url.h" diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c index 0a98ff80a5..9780928357 100644 --- a/libavformat/httpauth.c +++ b/libavformat/httpauth.c @@ -26,7 +26,6 @@ #include "libavutil/random_seed.h" #include "libavutil/md5.h" #include "urldecode.h" -#include "avformat.h" static void handle_basic_params(HTTPAuthState *state, const char *key, int key_len, char **dest, int *dest_len) diff --git a/libavformat/libsmbclient.c b/libavformat/libsmbclient.c index 3285868957..f81fff2dfc 100644 --- a/libavformat/libsmbclient.c +++ b/libavformat/libsmbclient.c @@ -21,8 +21,6 @@ #include #include "libavutil/avstring.h" #include "libavutil/opt.h" -#include "avformat.h" -#include "internal.h" #include "url.h" typedef struct { diff --git a/libavformat/md5proto.c b/libavformat/md5proto.c index 14cefe719c..653bf10e66 100644 --- a/libavformat/md5proto.c +++ b/libavformat/md5proto.c @@ -23,7 +23,6 @@ #include "libavutil/md5.h" #include "libavutil/mem.h" #include "libavutil/error.h" -#include "avformat.h" #include "avio.h" #include "internal.h" #include "url.h" diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index b970901d01..cac361047a 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -28,7 +28,6 @@ #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "avformat.h" -#include "avio_internal.h" #include "rtp.h" #include "rtpproto.h" #include "url.h" diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c index 13e2245015..61669e05ad 100644 --- a/libavformat/srtpproto.c +++ b/libavformat/srtpproto.c @@ -21,10 +21,8 @@ #include "libavutil/opt.h" #include "avformat.h" -#include "avio_internal.h" #include "url.h" -#include "internal.h" #include "rtpdec.h" #include "srtp.h" diff --git a/libavformat/subfile.c b/libavformat/subfile.c index 2936c79e06..633a9e3c62 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -20,7 +20,6 @@ #include "libavutil/avstring.h" #include "libavutil/opt.h" -#include "avformat.h" #include "url.h" typedef struct SubfileContext { diff --git a/libavformat/teeproto.c b/libavformat/teeproto.c index 7dd5065f4b..33877ed808 100644 --- a/libavformat/teeproto.c +++ b/libavformat/teeproto.c @@ -19,10 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/avstring.h" -#include "avformat.h" -#include "avio_internal.h" +#include "libavutil/dict.h" +#include "libavutil/error.h" +#include "libavutil/mem.h" +#include "avio.h" #include "tee_common.h" +#include "url.h" typedef struct ChildContext { URLContext *url_context; diff --git a/libavformat/udp.c b/libavformat/udp.c index 909213a467..d9514f5026 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -28,12 +28,10 @@ #define _BSD_SOURCE /* Needed for using struct ip_mreq with recent glibc */ #include "avformat.h" -#include "avio_internal.h" #include "libavutil/avassert.h" #include "libavutil/parseutils.h" #include "libavutil/fifo.h" #include "libavutil/intreadwrite.h" -#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/log.h" #include "libavutil/time.h" diff --git a/libavformat/url.c b/libavformat/url.c index f53fdf59d8..d5dd6a4666 100644 --- a/libavformat/url.c +++ b/libavformat/url.c @@ -19,16 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include -#include "avformat.h" -#include "internal.h" #include "config.h" +#include "avio.h" #include "url.h" #if CONFIG_NETWORK #include "network.h" #endif #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/error.h" +#include "libavutil/mem.h" /** * @file -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".