diff options
| author | wm4 <wm4@nowhere> | 2018-04-03 18:05:47 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-03 20:08:15 +0300 |
| commit | 428fc1cbeff232f57a5e67a1dd1bd9112ad39509 (patch) | |
| tree | a7115c36f43e9383ba438f760c6e94fb3cc5de56 | |
| parent | c338c0d90a78d1b93bd3361b464cfd562223fb9d (diff) | |
| download | mpv-428fc1cbeff232f57a5e67a1dd1bd9112ad39509.tar.bz2 mpv-428fc1cbeff232f57a5e67a1dd1bd9112ad39509.tar.xz | |
f_lavfi: use new libavfilter iteration API
| -rw-r--r-- | common/av_log.c | 1 | ||||
| -rw-r--r-- | filters/f_lavfi.c | 8 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/common/av_log.c b/common/av_log.c index 86d083c438..afc66b0ed2 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -160,7 +160,6 @@ void init_libav(struct mpv_global *global) pthread_mutex_unlock(&log_lock); avformat_network_init(); - avfilter_register_all(); #if HAVE_LIBAVDEVICE avdevice_register_all(); diff --git a/filters/f_lavfi.c b/filters/f_lavfi.c index dc594e7381..3716dd1f85 100644 --- a/filters/f_lavfi.c +++ b/filters/f_lavfi.c @@ -906,9 +906,11 @@ static bool is_usable(const AVFilter *filter, int media_type) static void dump_list(struct mp_log *log, int media_type) { mp_info(log, "Available libavfilter filters:\n"); - for (const AVFilter *filter = avfilter_next(NULL); filter; - filter = avfilter_next(filter)) - { + void *iter = NULL; + for (;;) { + const AVFilter *filter = av_filter_iterate(&iter); + if (!filter) + break; if (is_usable(filter, media_type)) mp_info(log, " %-16s %s\n", filter->name, filter->description); } @@ -416,7 +416,7 @@ ffmpeg_pkg_config_checks = [ 'libavcodec', '>= 58.16.100', 'libavformat', '>= 58.9.100', 'libswscale', '>= 5.0.101', - 'libavfilter', '>= 7.0.101', + 'libavfilter', '>= 7.14.100', 'libswresample', '>= 3.0.100', ] libav_pkg_config_checks = [ |