From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH v2 12/22] avformat: Remove avformat and avio headers from protocols
Date: Thu, 7 Sep 2023 03:05:28 +0200
Message-ID: <AS8P250MB074410F67DA48640DADBB7978FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744BBA654FCCAFE5649A4868FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
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 <libbluray/bluray.h>
#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 <string.h>
+
#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 <libsmbclient.h>
#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 <string.h>
+
#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 <string.h>
-#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".
next prev parent reply other threads:[~2023-09-07 1:06 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 1:02 [FFmpeg-devel] [PATCH v2 01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 02/22] avformat/avio: Don't use incompatible function pointer type for call Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 03/22] avformat/internal: Avoid casting const away Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 04/22] avformat/aviobuf: Don't use incompatible function pointer type for call Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 05/22] avformat/dashenc: Avoid unnecessary casts Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 06/22] avformat/dashenc: Use proper type for AVCodecIDs Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 07/22] avformat/dashenc: Add const where appropriate Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 08/22] avformat/dashenc: Simplify getting format string Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 09/22] avformat/dashenc: Avoid relocations for short strings Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 10/22] avformat/teeproto: Remove useless AVClass without options Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 11/22] avdevice/lavfi: Remove unnecessary avio_internal.h inclusion Andreas Rheinhardt
2023-09-07 1:05 ` Andreas Rheinhardt [this message]
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 13/22] avformat/teeproto: Remove always-false check Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 14/22] avformat/avio_internal: Don't include url.h Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 15/22] avformat/avio: Constify data pointees of write callbacks Andreas Rheinhardt
2023-09-07 15:02 ` Anton Khirnov
2023-09-07 17:08 ` Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 16/22] avutil/imgutils: Constify some pointees Andreas Rheinhardt
2023-09-10 11:09 ` Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 17/22] avutil/samplefmt: " Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 18/22] avutil/audio_fifo: " Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 19/22] avutil/fifo: Constify AVFifo pointees in peek functions Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 20/22] avcodec/v210dec: Don't cast const away Andreas Rheinhardt
2023-09-07 7:36 ` Paul B Mahol
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 21/22] avutil/imgutils: Add wrapper for av_image_copy() to avoid casts Andreas Rheinhardt
2023-09-07 1:05 ` [FFmpeg-devel] [PATCH v2 22/22] avfilter/vf_framepack: Use dedicated pointer for access Andreas Rheinhardt
2023-09-07 10:38 ` [FFmpeg-devel] [PATCH 23/26] avformat/avio: Remove duplicated freeing code Andreas Rheinhardt
2023-09-07 10:38 ` [FFmpeg-devel] [PATCH 24/26] avformat/avio: Remove redundant checks Andreas Rheinhardt
2023-09-07 10:38 ` [FFmpeg-devel] [PATCH 25/26] all: Use av_frame_replace() where appropriate Andreas Rheinhardt
2023-09-07 10:38 ` [FFmpeg-devel] [PATCH 26/26] avfilter/buffersrc: Use av_frame_clone() " Andreas Rheinhardt
2023-09-07 11:09 ` Nicolas George
2023-09-07 14:03 ` [FFmpeg-devel] [PATCH 27/31] avfilter/vf_vif: Don't cast const away unnecessarily Andreas Rheinhardt
2023-09-07 14:32 ` Paul B Mahol
2023-09-07 14:03 ` [FFmpeg-devel] [PATCH 28/31] avfilter/vsrc_testsrc: Don't use const uint8_t* when pointee changes Andreas Rheinhardt
2023-09-07 14:47 ` Paul B Mahol
2023-09-07 14:03 ` [FFmpeg-devel] [PATCH 29/31] avcodec/tiff: Don't cast const away Andreas Rheinhardt
2023-09-07 17:58 ` Paul B Mahol
2023-09-07 14:03 ` [FFmpeg-devel] [PATCH 30/31] avfilter/vf_varblur: Don't use pointer-to-const for destination Andreas Rheinhardt
2023-09-07 14:31 ` Paul B Mahol
2023-09-07 14:03 ` [FFmpeg-devel] [PATCH 31/31] avfilter/blend_modes: Always preserve constness Andreas Rheinhardt
2023-09-07 14:32 ` Paul B Mahol
2023-09-10 10:23 ` [FFmpeg-devel] [PATCH v2 01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB074410F67DA48640DADBB7978FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git