diff options
| author | Philip Langdale <philipl@overt.org> | 2023-03-25 18:20:26 -0700 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2023-03-28 11:32:51 -0700 |
| commit | 24bed9b94991d060024dedeb05718d15d95fa77d (patch) | |
| tree | fea1fc7f4f496f324e5c68ccfa612339592e016e /demux | |
| parent | 6a62aa0330370959f49f9324f0cd54c6cb187abe (diff) | |
| download | mpv-24bed9b94991d060024dedeb05718d15d95fa77d.tar.bz2 mpv-24bed9b94991d060024dedeb05718d15d95fa77d.tar.xz | |
demux_lavf: update to handle deprecation of `io_close`
`io_close2` was introduced as a superior replacement for `io_close` in
ffmpeg 5.0, and then deprecated in 6.0. The difference is that
`io_close2` can return errors. In our case, we're just calling through
to the original function anyway, so we don't need to do more than pass
the return value back.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_lavf.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index ec5716c634..ee08b4df6c 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -223,6 +223,12 @@ struct stream_info { double ts_offset; }; +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 10, 100) + #define HAVE_IO_CLOSE2 1 +#else + #define HAVE_IO_CLOSE2 0 +#endif + typedef struct lavf_priv { struct stream *stream; bool own_stream; @@ -256,7 +262,11 @@ typedef struct lavf_priv { int num_nested; int (*default_io_open)(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags, AVDictionary **options); +#if HAVE_IO_CLOSE2 + int (*default_io_close2)(struct AVFormatContext *s, AVIOContext *pb); +#else void (*default_io_close)(struct AVFormatContext *s, AVIOContext *pb); +#endif } lavf_priv_t; static void update_read_stats(struct demuxer *demuxer) @@ -929,7 +939,11 @@ static int nested_io_open(struct AVFormatContext *s, AVIOContext **pb, return r; } +#if HAVE_IO_CLOSE2 +static int nested_io_close2(struct AVFormatContext *s, AVIOContext *pb) +#else static void nested_io_close(struct AVFormatContext *s, AVIOContext *pb) +#endif { struct demuxer *demuxer = s->opaque; lavf_priv_t *priv = demuxer->priv; @@ -941,8 +955,11 @@ static void nested_io_close(struct AVFormatContext *s, AVIOContext *pb) } } - +#if HAVE_IO_CLOSE2 + return priv->default_io_close2(s, pb); +#else priv->default_io_close(s, pb); +#endif } static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) @@ -1040,9 +1057,14 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) avfc->opaque = demuxer; if (demuxer->access_references) { priv->default_io_open = avfc->io_open; - priv->default_io_close = avfc->io_close; avfc->io_open = nested_io_open; +#if HAVE_IO_CLOSE2 + priv->default_io_close2 = avfc->io_close2; + avfc->io_close2 = nested_io_close2; +#else + priv->default_io_close = avfc->io_close; avfc->io_close = nested_io_close; +#endif } else { avfc->io_open = block_io_open; } |