diff --git a/.travis.yml b/.travis.yml
index 162941ecbf..b7881a1ad7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ matrix:
       compiler: gcc
     - os: linux
       compiler: clang
+    - env: LIBAV=libav-git
 
 before_install: TOOLS/travis-deps libass-stable $LIBAV
 script:
diff --git a/common/av_common.c b/common/av_common.c
index 0981e919e1..a76dd37117 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -219,42 +219,43 @@ void mp_set_avcodec_threads(struct mp_log *l, AVCodecContext *avctx, int threads
     avctx->thread_count = threads;
 }
 
-void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
+static void add_codecs(struct mp_decoder_list *list, enum AVMediaType type,
+                       bool decoders)
 {
-    AVCodec *cur = NULL;
+    const AVCodec *cur = NULL;
+    void *iter = NULL;
     for (;;) {
-        cur = av_codec_next(cur);
+        cur = av_codec_iterate(&iter);
         if (!cur)
             break;
-        if (av_codec_is_decoder(cur) && cur->type == type) {
+        if (av_codec_is_decoder(cur) == decoders &&
+            (type == AVMEDIA_TYPE_UNKNOWN || cur->type == type))
+        {
             mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
                            cur->name, cur->long_name);
         }
     }
 }
 
+void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
+{
+    add_codecs(list, type, true);
+}
+
 // (Abuses the decoder list data structures.)
 void mp_add_lavc_encoders(struct mp_decoder_list *list)
 {
-    AVCodec *cur = NULL;
-    for (;;) {
-        cur = av_codec_next(cur);
-        if (!cur)
-            break;
-        if (av_codec_is_encoder(cur)) {
-            mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
-                           cur->name, cur->long_name);
-        }
-    }
+    add_codecs(list, AVMEDIA_TYPE_UNKNOWN, false);
 }
 
 char **mp_get_lavf_demuxers(void)
 {
     char **list = NULL;
-    AVInputFormat *cur = NULL;
+    const AVInputFormat *cur = NULL;
+    void *iter = NULL;
     int num = 0;
     for (;;) {
-        cur = av_iformat_next(cur);
+        cur = av_demuxer_iterate(&iter);
         if (!cur)
             break;
         MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(NULL, cur->name));
diff --git a/common/av_log.c b/common/av_log.c
index c90db33f6a..86d083c438 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -159,8 +159,6 @@ void init_libav(struct mpv_global *global)
     }
     pthread_mutex_unlock(&log_lock);
 
-    avcodec_register_all();
-    av_register_all();
     avformat_network_init();
     avfilter_register_all();
 
diff --git a/common/encode_lavc.c b/common/encode_lavc.c
index 747323878f..72e99a5c30 100644
--- a/common/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -204,8 +204,7 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options,
         return NULL;
     }
 
-    av_strlcpy(ctx->avc->filename, filename,
-               sizeof(ctx->avc->filename));
+    ctx->avc->url = av_strdup(filename);
 
     ctx->foptions = NULL;
     if (ctx->options->fopts) {
@@ -232,7 +231,7 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options,
         }
     } else
         ctx->vc = avcodec_find_encoder(av_guess_codec(ctx->avc->oformat, NULL,
-                                                      ctx->avc->filename, NULL,
+                                                      ctx->avc->url, NULL,
                                                       AVMEDIA_TYPE_VIDEO));
 
     if (ctx->options->acodec) {
@@ -251,7 +250,7 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options,
         }
     } else
         ctx->ac = avcodec_find_encoder(av_guess_codec(ctx->avc->oformat, NULL,
-                                                      ctx->avc->filename, NULL,
+                                                      ctx->avc->url, NULL,
                                                       AVMEDIA_TYPE_AUDIO));
 
     if (!ctx->vc && !ctx->ac) {
@@ -338,12 +337,12 @@ int encode_lavc_start(struct encode_lavc_context *ctx)
 
     if (!(ctx->avc->oformat->flags & AVFMT_NOFILE)) {
         MP_INFO(ctx, "Opening output file: %s\n",
-                ctx->avc->filename);
+                ctx->avc->url);
 
-        if (avio_open(&ctx->avc->pb, ctx->avc->filename,
+        if (avio_open(&ctx->avc->pb, ctx->avc->url,
                       AVIO_FLAG_WRITE) < 0) {
             encode_lavc_fail(ctx, "could not open '%s'\n",
-                             ctx->avc->filename);
+                             ctx->avc->url);
             return 0;
         }
     }
@@ -481,12 +480,10 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
                                  const char *prefix)
 {
     if (!*bytebuf) {
-        char buf[sizeof(ctx->avc->filename) + 12];
+        char buf[1024];
         AVDictionaryEntry *de = av_dict_get(ctx->voptions, "flags", NULL, 0);
 
-        snprintf(buf, sizeof(buf), "%s-%s-pass1.log", ctx->avc->filename,
-                 prefix);
-        buf[sizeof(buf) - 1] = 0;
+        snprintf(buf, sizeof(buf), "%s-%s-pass1.log", ctx->avc->url, prefix);
 
         if (value_has_flag(de ? de->value : "", "pass2")) {
             if (!(*bytebuf = stream_open(buf, ctx->global))) {
@@ -500,7 +497,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
                 if (content.start == NULL) {
                     MP_WARN(ctx, "%s: could not read '%s', "
                            "disabling 2-pass encoding at pass 1\n",
-                           prefix, ctx->avc->filename);
+                           prefix, ctx->avc->url);
                 } else {
                     content.start[content.len] = 0;
                     codec->stats_in = content.start;
@@ -515,7 +512,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
                 MP_WARN(ctx,
                     "%s: could not open '%s', disabling "
                     "2-pass encoding at pass 1\n",
-                    prefix, ctx->avc->filename);
+                    prefix, ctx->avc->url);
                 set_to_avdictionary(ctx, dictp, "flags", "-pass1");
             }
         }
@@ -889,7 +886,7 @@ void encode_lavc_discontinuity(struct encode_lavc_context *ctx)
     pthread_mutex_unlock(&ctx->lock);
 }
 
-static void encode_lavc_printoptions(struct mp_log *log, void *obj,
+static void encode_lavc_printoptions(struct mp_log *log, const void *obj,
                                      const char *indent, const char *subindent,
                                      const char *unit, int filter_and,
                                      int filter_eq)
@@ -964,29 +961,28 @@ static void encode_lavc_printoptions(struct mp_log *log, void *obj,
 bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
 {
     bool help_output = false;
-    if (av_codec_next(NULL) == NULL)
-        mp_err(log, "NO CODECS\n");
 #define CHECKS(str) ((str) && \
                      strcmp((str), "help") == 0 ? (help_output |= 1) : 0)
 #define CHECKV(strv) ((strv) && (strv)[0] && \
                       strcmp((strv)[0], "help") == 0 ? (help_output |= 1) : 0)
     if (CHECKS(opts->format)) {
-        AVOutputFormat *c = NULL;
+        const AVOutputFormat *c = NULL;
+        void *iter = NULL;
         mp_info(log, "Available output formats:\n");
-        while ((c = av_oformat_next(c)))
+        while ((c = av_muxer_iterate(&iter)))
             mp_info(log, "  --of=%-13s %s\n", c->name,
                    c->long_name ? c->long_name : "");
-        av_free(c);
     }
     if (CHECKV(opts->fopts)) {
         AVFormatContext *c = avformat_alloc_context();
-        AVOutputFormat *format = NULL;
+        const AVOutputFormat *format = NULL;
         mp_info(log, "Available output format ctx->options:\n");
         encode_lavc_printoptions(log, c, "  --ofopts=", "           ", NULL,
                                  AV_OPT_FLAG_ENCODING_PARAM,
                                  AV_OPT_FLAG_ENCODING_PARAM);
         av_free(c);
-        while ((format = av_oformat_next(format))) {
+        void *iter = NULL;
+        while ((format = av_muxer_iterate(&iter))) {
             if (format->priv_class) {
                 mp_info(log, "Additionally, for --of=%s:\n",
                        format->name);
@@ -999,7 +995,7 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
     }
     if (CHECKV(opts->vopts)) {
         AVCodecContext *c = avcodec_alloc_context3(NULL);
-        AVCodec *codec = NULL;
+        const AVCodec *codec = NULL;
         mp_info(log, "Available output video codec ctx->options:\n");
         encode_lavc_printoptions(log,
             c, "  --ovcopts=", "            ", NULL,
@@ -1008,7 +1004,8 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
             AV_OPT_FLAG_ENCODING_PARAM |
             AV_OPT_FLAG_VIDEO_PARAM);
         av_free(c);
-        while ((codec = av_codec_next(codec))) {
+        void *iter = NULL;
+        while ((codec = av_codec_iterate(&iter))) {
             if (!av_codec_is_encoder(codec))
                 continue;
             if (codec->type != AVMEDIA_TYPE_VIDEO)
@@ -1031,7 +1028,7 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
     }
     if (CHECKV(opts->aopts)) {
         AVCodecContext *c = avcodec_alloc_context3(NULL);
-        AVCodec *codec = NULL;
+        const AVCodec *codec = NULL;
         mp_info(log, "Available output audio codec ctx->options:\n");
         encode_lavc_printoptions(log,
             c, "  --oacopts=", "            ", NULL,
@@ -1040,7 +1037,8 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
             AV_OPT_FLAG_ENCODING_PARAM |
             AV_OPT_FLAG_AUDIO_PARAM);
         av_free(c);
-        while ((codec = av_codec_next(codec))) {
+        void *iter = NULL;
+        while ((codec = av_codec_iterate(&iter))) {
             if (!av_codec_is_encoder(codec))
                 continue;
             if (codec->type != AVMEDIA_TYPE_AUDIO)
@@ -1062,9 +1060,10 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
         }
     }
     if (CHECKS(opts->vcodec)) {
-        AVCodec *c = NULL;
+        const AVCodec *c = NULL;
+        void *iter = NULL;
         mp_info(log, "Available output video codecs:\n");
-        while ((c = av_codec_next(c))) {
+        while ((c = av_codec_iterate(&iter))) {
             if (!av_codec_is_encoder(c))
                 continue;
             if (c->type != AVMEDIA_TYPE_VIDEO)
@@ -1072,12 +1071,12 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
             mp_info(log, "  --ovc=%-12s %s\n", c->name,
                    c->long_name ? c->long_name : "");
         }
-        av_free(c);
     }
     if (CHECKS(opts->acodec)) {
-        AVCodec *c = NULL;
+        const AVCodec *c = NULL;
+        void *iter = NULL;
         mp_info(log, "Available output audio codecs:\n");
-        while ((c = av_codec_next(c))) {
+        while ((c = av_codec_iterate(&iter))) {
             if (!av_codec_is_encoder(c))
                 continue;
             if (c->type != AVMEDIA_TYPE_AUDIO)
@@ -1085,7 +1084,6 @@ bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *opts)
             mp_info(log, "  --oac=%-12s %s\n", c->name,
                    c->long_name ? c->long_name : "");
         }
-        av_free(c);
     }
     return help_output;
 }
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);
 }
 
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index fa07298571..4ccf62962b 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -258,9 +258,10 @@ static void add_hwdec_item(struct hwdec_info **infos, int *num_infos,
 
 static void add_all_hwdec_methods(struct hwdec_info **infos, int *num_infos)
 {
-    AVCodec *codec = NULL;
+    const AVCodec *codec = NULL;
+    void *iter = NULL;
     while (1) {
-        codec = av_codec_next(codec);
+        codec = av_codec_iterate(&iter);
         if (!codec)
             break;
         if (codec->type != AVMEDIA_TYPE_VIDEO || !av_codec_is_decoder(codec))
diff --git a/wscript b/wscript
index 49cb12a9c3..f44c8a357d 100644
--- a/wscript
+++ b/wscript
@@ -412,9 +412,9 @@ iconv support use --disable-iconv.",
 ]
 
 ffmpeg_pkg_config_checks = [
-    'libavutil',     '>= 56.6.100',
-    'libavcodec',    '>= 58.7.100',
-    'libavformat',   '>= 58.0.102',
+    'libavutil',     '>= 56.7.100',
+    'libavcodec',    '>= 58.10.100',
+    'libavformat',   '>= 58.9.100',
     'libswscale',    '>= 5.0.101',
     'libavfilter',   '>= 7.0.101',
     'libswresample', '>= 3.0.100',