virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/hls: Split allowed_segment_extensions off allowed_extensions

Browse Source 
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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-04-30 01:37:27 +02:00
parent 1dbc5675c1
commit f99f223eb1
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/hls.c
View File

@ -224,6 +224,7 @@ typedef struct HLSContext {
AVDictionary *avio_opts; AVDictionary *avio_opts;
AVDictionary *seg_format_opts; AVDictionary *seg_format_opts;
char *allowed_extensions; char *allowed_extensions;
char *allowed_segment_extensions;
int extension_picky; int extension_picky;
int max_reload; int max_reload;
int http_persistent; int http_persistent;
@ -740,12 +741,12 @@ static int test_segment(AVFormatContext *s, const AVInputFormat *in_fmt, struct
if (!c->extension_picky) if (!c->extension_picky)
return 0; return 0;
if (strcmp(c->allowed_extensions, "ALL")) if (strcmp(c->allowed_segment_extensions, "ALL"))
matchA = av_match_ext (seg->url, c->allowed_extensions) matchA = av_match_ext (seg->url, c->allowed_segment_extensions)
+ 2*(ff_match_url_ext(seg->url, c->allowed_extensions) > 0); + 2*(ff_match_url_ext(seg->url, c->allowed_segment_extensions) > 0);
if (!matchA) { 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; return AVERROR_INVALIDDATA;
} }
@ -2774,6 +2775,14 @@ static const AVOption hls_options[] = {
",fmp4" // https://github.com/yt-dlp/yt-dlp/issues/12700 ",fmp4" // https://github.com/yt-dlp/yt-dlp/issues/12700
}, },
INT_MIN, INT_MAX, FLAGS}, 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", {"extension_picky", "Be picky with all extensions matching",
OFFSET(extension_picky), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS}, 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", {"max_reload", "Maximum number of times a insufficient list is attempted to be reloaded",