RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 13:49:33 +00:00
Code Issues Releases Wiki Activity

demux_lavf: update to handle deprecation of io_close

Browse Source 
`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.
This commit is contained in:
Philip Langdale 2023-03-25 18:20:26 -07:00 committed by Philip Langdale
parent 6a62aa0330
commit 24bed9b949
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
demux/demux_lavf.c
View File

@ -223,6 +223,12 @@ struct stream_info {
double ts_offset; 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 { typedef struct lavf_priv {
struct stream *stream; struct stream *stream;
bool own_stream; bool own_stream;
@ -256,7 +262,11 @@ typedef struct lavf_priv {
int num_nested; int num_nested;
int (*default_io_open)(struct AVFormatContext *s, AVIOContext **pb, int (*default_io_open)(struct AVFormatContext *s, AVIOContext **pb,
const char *url, int flags, AVDictionary **options); 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); void (*default_io_close)(struct AVFormatContext *s, AVIOContext *pb);
#endif
} lavf_priv_t; } lavf_priv_t;
static void update_read_stats(struct demuxer *demuxer) static void update_read_stats(struct demuxer *demuxer)
@ -929,7 +939,11 @@ static int nested_io_open(struct AVFormatContext *s, AVIOContext **pb,
return r; 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) static void nested_io_close(struct AVFormatContext *s, AVIOContext *pb)
#endif
{ {
struct demuxer *demuxer = s->opaque; struct demuxer *demuxer = s->opaque;
lavf_priv_t *priv = demuxer->priv; 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); priv->default_io_close(s, pb);
#endif
} }
static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) 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; avfc->opaque = demuxer;
if (demuxer->access_references) { if (demuxer->access_references) {
priv->default_io_open = avfc->io_open; priv->default_io_open = avfc->io_open;
priv->default_io_close = avfc->io_close;
avfc->io_open = nested_io_open; 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; avfc->io_close = nested_io_close;
#endif
} else { } else {
avfc->io_open = block_io_open; avfc->io_open = block_io_open;
} }