From b22a4da1df113cee07ea49b49ac2737f30fc998e Mon Sep 17 00:00:00 2001 From: llyyr Date: Sun, 23 Feb 2025 22:44:58 +0530 Subject: [PATCH] demux_lavf: disable extension_picky for hls demuxer globally Added in https://github.com/FFmpeg/FFmpeg/commit/91d96dc8ddaebe0b6cb393f672085e6bfaf15a31 The user can still turn this on via demuxer-lavf-o=extension_picky=1 if they want to. This causes quite a few problems with many HLS sources where the codecs are not known at probe time for whatever reason. Youtube for instance transports aac audio inside ".ts" extension urls which are disallowed by this option. As an aside, the FFmpeg test is also buggy and leaks a nested connection for any playlist item that fails the extension check. mpv catches this and prints "Leaking 1 nested connections (FFmpeg bug)" for every HLS stream that has at least one stream that fails the extension check. --- demux/demux_lavf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 038c3e1960..5c3bb7c65b 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -147,6 +147,7 @@ struct format_hack { bool no_seek_on_no_duration : 1; bool readall_on_no_streamseek : 1; bool first_frame_only : 1; + bool no_ext_picky : 1; // set "extension_picky" to false }; #define BLACKLIST(fmt) {fmt, .ignore = true} @@ -162,7 +163,7 @@ static const struct format_hack format_hacks[] = { {"mp3", "audio/mpeg", 24, 0.5}, {"mp3", NULL, 24, .max_probe = true}, - {"hls", .no_stream = true, .clear_filepos = true}, + {"hls", .no_stream = true, .clear_filepos = true, .no_ext_picky = true}, {"dash", .no_stream = true, .clear_filepos = true}, {"sdp", .clear_filepos = true, .is_network = true, .no_seek = true}, {"mpeg", .use_stream_ids = true}, @@ -1005,6 +1006,18 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) "analyzeduration to %f\n", analyze_duration); } + if (priv->format_hack.no_ext_picky) { + bool user_set_ext_picky = false; + for (int i = 0; lavfdopts->avopts && lavfdopts->avopts[i * 2]; i++) { + if (bstr_startswith0(bstr0(lavfdopts->avopts[i * 2]), "extension_picky")) { + user_set_ext_picky = true; + break; + } + } + if (!user_set_ext_picky && av_dict_set(&dopts, "extension_picky", "0", 0) >= 0) + MP_VERBOSE(demuxer, "Option extension_picky=0 was set due to known FFmpeg bugs\n"); + } + if ((priv->avif_flags & AVFMT_NOFILE) || priv->format_hack.no_stream) { mp_setup_av_network_options(&dopts, priv->avif->name, demuxer->global, demuxer->log);