har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hls: Try to implement RFC8216 playlist refusal

Browse Source 
This should fix the regression since 6b1f68ccb04d791f0250e05687c346a99ff47ea1

Should fix Ticket10353 (please test and report cases that still fail)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-05-15 00:56:10 +02:00
parent a7b06bfc5d
commit 954d16fa3f
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/hls.c
View File

@ -2534,7 +2534,16 @@ static int hls_probe(const AVProbeData *p)
strstr(p->buf, "#EXT-X-TARGETDURATION:") || strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) { strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) {
if (!av_match_ext(p->filename, "m3u8,hls,m3u")) { int mime_ok = p->mime_type && !(
av_strcasecmp(p->mime_type, "application/vnd.apple.mpegurl") &&
av_strcasecmp(p->mime_type, "audio/mpegurl") &&
av_strcasecmp(p->mime_type, "audio/x-mpegurl") &&
av_strcasecmp(p->mime_type, "application/x-mpegurl")
);
if (!av_match_ext (p->filename, "m3u8,hls,m3u") &&
ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0 &&
!mime_ok) {
av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n"); av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
return 0; return 0;
} }