Found-by: Kacper Michajlow <kaspe...@gmail.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavformat/hls.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index fc29ef0ca9..2bc142510e 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -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;
}
--
2.17.1
_______________________________________________
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".
