This allows the user to set only the one that is needed to ALL or a
specific "wrong" extension like html
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavformat/hls.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 84a5e66149b..34a36f68f1f 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -224,6 +224,7 @@ typedef struct HLSContext {
AVDictionary *avio_opts;
AVDictionary *seg_format_opts;
char *allowed_extensions;
+ char *allowed_segment_extensions;
int extension_picky;
int max_reload;
int http_persistent;
@@ -740,12 +741,12 @@ static int test_segment(AVFormatContext *s, const
AVInputFormat *in_fmt, struct
if (!c->extension_picky)
return 0;
- if (strcmp(c->allowed_extensions, "ALL"))
- matchA = av_match_ext (seg->url, c->allowed_extensions)
- + 2*(ff_match_url_ext(seg->url, c->allowed_extensions) > 0);
+ if (strcmp(c->allowed_segment_extensions, "ALL"))
+ matchA = av_match_ext (seg->url, c->allowed_segment_extensions)
+ + 2*(ff_match_url_ext(seg->url,
c->allowed_segment_extensions) > 0);
if (!matchA) {
- av_log(s, AV_LOG_ERROR, "URL %s is not in allowed_extensions, consider
updating hls.c and submitting a patch to ffmpeg-devel, if this should be
added\n", seg->url);
+ av_log(s, AV_LOG_ERROR, "URL %s is not in allowed_segment_extensions,
consider updating hls.c and submitting a patch to ffmpeg-devel, if this should
be added\n", seg->url);
return AVERROR_INVALIDDATA;
}
@@ -2774,6 +2775,14 @@ static const AVOption hls_options[] = {
",fmp4" // https://github.com/yt-dlp/yt-dlp/issues/12700
},
INT_MIN, INT_MAX, FLAGS},
+ {"allowed_segment_extensions", "List of file extensions that hls is
allowed to access",
+ OFFSET(allowed_segment_extensions), AV_OPT_TYPE_STRING,
+ {.str =
"3gp,aac,avi,ac3,eac3,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,mpegts,ogg,ogv,oga,ts,vob,vtt,wav,webvtt"
+ ",cmfv,cmfa" // Ticket11526 www.nicovideo.jp
+ ",ec3" // part of Ticket11435 (Elisa Viihde (Finnish online
recording service))
+ ",fmp4" // https://github.com/yt-dlp/yt-dlp/issues/12700
+ },
+ INT_MIN, INT_MAX, FLAGS},
{"extension_picky", "Be picky with all extensions matching",
OFFSET(extension_picky), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS},
{"max_reload", "Maximum number of times a insufficient list is attempted
to be reloaded",
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
