Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/avformat.c | 14 ++------------
libavformat/avformat.h | 10 ----------
libavformat/dashenc.c | 5 -----
libavformat/fifo.c | 5 -----
libavformat/hlsenc.c | 5 -----
libavformat/imfdec.c | 5 -----
libavformat/options.c | 12 ------------
libavformat/segment.c | 5 -----
libavformat/tee.c | 5 -----
libavformat/version_major.h | 1 -
10 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 882927f7b1..074e98491d 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -916,18 +916,8 @@ void ff_format_set_url(AVFormatContext *s, char *url)
int ff_format_io_close(AVFormatContext *s, AVIOContext **pb)
{
int ret = 0;
- if (*pb) {
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- if (s->io_close == ff_format_io_close_default || s->io_close == NULL)
-#endif
- ret = s->io_close2(s, *pb);
-#if FF_API_AVFORMAT_IO_CLOSE
- else
- s->io_close(s, *pb);
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
- }
+ if (*pb)
+ ret = s->io_close2(s, *pb);
*pb = NULL;
return ret;
}
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 446ca9e6bf..ed02dd87b9 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1743,16 +1743,6 @@ typedef struct AVFormatContext {
int (*io_open)(struct AVFormatContext *s, AVIOContext **pb, const char
*url,
int flags, AVDictionary **options);
-#if FF_API_AVFORMAT_IO_CLOSE
- /**
- * A callback for closing the streams opened with
AVFormatContext.io_open().
- *
- * @deprecated use io_close2
- */
- attribute_deprecated
- void (*io_close)(struct AVFormatContext *s, AVIOContext *pb);
-#endif
-
/**
* ',' separated list of disallowed protocols.
* - encoding: unused
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 4a92863f22..706e9ab6f4 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -1544,11 +1544,6 @@ static int dash_init(AVFormatContext *s)
return AVERROR_MUXER_NOT_FOUND;
ctx->interrupt_callback = s->interrupt_callback;
ctx->opaque = s->opaque;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- ctx->io_close = s->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
ctx->io_close2 = s->io_close2;
ctx->io_open = s->io_open;
ctx->strict_std_compliance = s->strict_std_compliance;
diff --git a/libavformat/fifo.c b/libavformat/fifo.c
index 8fb4975a5c..94502129c6 100644
--- a/libavformat/fifo.c
+++ b/libavformat/fifo.c
@@ -501,11 +501,6 @@ static int fifo_mux_init(AVFormatContext *avf, const
AVOutputFormat *oformat,
if (ret < 0)
return ret;
avf2->opaque = avf->opaque;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- avf2->io_close = avf->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
avf2->io_close2 = avf->io_close2;
avf2->io_open = avf->io_open;
avf2->flags = avf->flags;
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 55123d2297..dd2abbbd85 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -865,11 +865,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream
*vs)
oc->max_delay = s->max_delay;
oc->opaque = s->opaque;
oc->io_open = s->io_open;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- oc->io_close = s->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
oc->io_close2 = s->io_close2;
oc->strict_std_compliance = s->strict_std_compliance;
av_dict_copy(&oc->metadata, s->metadata, 0);
diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index 818b5e590b..901080555a 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -379,11 +379,6 @@ static int open_track_resource_context(AVFormatContext *s,
return AVERROR(ENOMEM);
track_resource->ctx->io_open = s->io_open;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- track_resource->ctx->io_close = s->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
track_resource->ctx->io_close2 = s->io_close2;
track_resource->ctx->flags |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
diff --git a/libavformat/options.c b/libavformat/options.c
index 75ec86ce05..7eaf281d86 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -152,13 +152,6 @@ static int io_open_default(AVFormatContext *s, AVIOContext
**pb,
return ffio_open_whitelist(pb, url, flags, &s->interrupt_callback,
options, s->protocol_whitelist, s->protocol_blacklist);
}
-#if FF_API_AVFORMAT_IO_CLOSE
-void ff_format_io_close_default(AVFormatContext *s, AVIOContext *pb)
-{
- avio_close(pb);
-}
-#endif
-
static int io_close2_default(AVFormatContext *s, AVIOContext *pb)
{
return avio_close(pb);
@@ -175,11 +168,6 @@ AVFormatContext *avformat_alloc_context(void)
s = &si->pub;
s->av_class = &av_format_context_class;
s->io_open = io_open_default;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- s->io_close = ff_format_io_close_default;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
s->io_close2= io_close2_default;
av_opt_set_defaults(s);
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 2a82f39f31..63ba226692 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -160,11 +160,6 @@ static int segment_mux_init(AVFormatContext *s)
oc->max_delay = s->max_delay;
av_dict_copy(&oc->metadata, s->metadata, 0);
oc->opaque = s->opaque;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- oc->io_close = s->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
oc->io_close2 = s->io_close2;
oc->io_open = s->io_open;
oc->flags = s->flags;
diff --git a/libavformat/tee.c b/libavformat/tee.c
index cfa8346bc9..a101fede5b 100644
--- a/libavformat/tee.c
+++ b/libavformat/tee.c
@@ -236,11 +236,6 @@ static int open_slave(AVFormatContext *avf, char *slave,
TeeSlave *tee_slave)
av_dict_copy(&avf2->metadata, avf->metadata, 0);
avf2->opaque = avf->opaque;
avf2->io_open = avf->io_open;
-#if FF_API_AVFORMAT_IO_CLOSE
-FF_DISABLE_DEPRECATION_WARNINGS
- avf2->io_close = avf->io_close;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
avf2->io_close2 = avf->io_close2;
avf2->interrupt_callback = avf->interrupt_callback;
avf2->flags = avf->flags;
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index ee1f8bdbb7..2c8ab84112 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
*
*/
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61)
-#define FF_API_AVFORMAT_IO_CLOSE (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61)
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
