diff options
author | wm4 <wm4@nowhere> | 2018-02-12 19:28:30 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-13 17:45:29 -0800 |
commit | 706bb1d0c756be95e8646c6e433d5d24f7c75dca (patch) | |
tree | 6cbb460e04f4b394fc65cce2a17bbde6ae80e3ec /demux | |
parent | 3ffa70e2da121b1924f3fb74b0de0787184de237 (diff) | |
download | mpv-706bb1d0c756be95e8646c6e433d5d24f7c75dca.tar.bz2 mpv-706bb1d0c756be95e8646c6e433d5d24f7c75dca.tar.xz |
Fix recent FFmpeg deprecations
This includes codec/muxer/demuxer iteration (different iteration
function, registration functions deprecated), and the renaming of
AVFormatContext.filename to url (plus making it a malloced string).
Libav doesn't have the new API yet, so it will break. I hope they will
add the new APIs too.
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux_lavf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index cb6fbbc7c7..93117c975c 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -314,8 +314,9 @@ static int64_t mp_read_seek(void *opaque, int stream_idx, int64_t ts, int flags) static void list_formats(struct demuxer *demuxer) { MP_INFO(demuxer, "Available lavf input formats:\n"); - AVInputFormat *fmt = NULL; - while ((fmt = av_iformat_next(fmt))) + const AVInputFormat *fmt; + void *iter = NULL; + while ((fmt = av_demuxer_iterate(&iter))) MP_INFO(demuxer, "%15s : %s\n", fmt->name, fmt->long_name); } |