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

avformat/hls: Better message from hls_probe()

Browse Source 
Found-by: Kacper Michajlow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-05-15 21:33:03 +02:00
parent a0cb5722fd
commit 5b630743c6
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/hls.c
View File

@ -2536,17 +2536,23 @@ static int hls_probe(const AVProbeData *p)
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/mpegurl")
);
int mime_x = p->mime_type && !(
av_strcasecmp(p->mime_type, "audio/x-mpegurl") &&
av_strcasecmp(p->mime_type, "application/x-mpegurl")
);
if (!mime_ok &&
!mime_x &&
!av_match_ext (p->filename, "m3u8,hls,m3u") &&
ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) {
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 and non standard mime type\n");
return 0;
}
if (mime_x)
av_log(NULL, AV_LOG_WARNING, "mime type is not rfc8216 compliant\n");
return AVPROBE_SCORE_MAX;
}