On 5/14/23 20:05, Michael Niedermayer wrote:
This is not well tested and can likely be improved, just a
hotfix for hls probe failures since 6b1f68ccb04d791f0250e05687c346a99ff47ea1
Should fix Ticket10353 (please test and report cases that still fail)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavformat/hls.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index df2442c376..790ae7a96a 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -2534,7 +2534,16 @@ static int hls_probe(const AVProbeData *p)
strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
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 &&
What's the point of checking both av_match_ext and ff_match_url_ext
here? Should only want one or the other.
+ !mime_ok) {
Put !mime_ok first to take advantage of lazy &&, as it will usually be
okay in practice.
av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard
extension\n");
return 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".
