videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat: remove deprecated FF_API_AVFORMAT_IO_CLOSE 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-01-20 10:48:39 -03:00
parent aaefe47913
commit d6799ee0e4
10 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/avformat.c
View File

@ -944,18 +944,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;
}

10
libavformat/avformat.h
View File

@ -1914,16 +1914,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

5
libavformat/dashenc.c
View File

@ -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;

5
libavformat/fifo.c
View File

@ -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;

5
libavformat/hlsenc.c
View File

@ -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);

5
libavformat/imfdec.c
View File

@ -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;

12
libavformat/options.c
View File

@ -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);

5
libavformat/segment.c
View File

@ -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;

5
libavformat/tee.c
View File

@ -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;

1
libavformat/version_major.h
View File

@ -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)