aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2025-01-28 13:26:34 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2025-02-02 02:42:02 +0100
commit9e12572933dc1c49e9b35d772ddcae896c2ba8a8 (patch)
tree87e2e4bd427a42ecb40b8f9f506064252181ea00
parent9b5a4c0aea1f8ac2082c223d8b6a5e5d8a896dbd (diff)
downloadffmpeg-9e12572933dc1c49e9b35d772ddcae896c2ba8a8.tar.gz
avformat/hls: .ts is always ok even if its a mov/mp4
Maybe fixes: 11435 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/hls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index d2787ade46..e8b7cf4006 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -754,6 +754,10 @@ static int test_segment(AVFormatContext *s, const AVInputFormat *in_fmt, struct
if (in_fmt->extensions) {
matchF = av_match_ext( seg->url, in_fmt->extensions)
+ 2*(ff_match_url_ext(seg->url, in_fmt->extensions) > 0);
+ if(av_match_name("mp4", in_fmt->name)) {
+ matchF |= av_match_ext( seg->url, "ts")
+ + 2*(ff_match_url_ext(seg->url, "ts") > 0);
+ }
} else if (!strcmp(in_fmt->name, "mpegts"))
matchF = 3;