[FFmpeg-cvslog] avformat/hls: .ts is always ok even if its a mov/mp4
Michael Niedermayer
git at videolan.org
Thu Feb 27 19:09:27 EET 2025
ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Tue Jan 28 13:26:34 2025 +0100| [71274326b1375b07deee0fac3506901693689daf] | committer: Michael Niedermayer
avformat/hls: .ts is always ok even if its a mov/mp4
Maybe fixes: 11435
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 9e12572933dc1c49e9b35d772ddcae896c2ba8a8)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71274326b1375b07deee0fac3506901693689daf
---
libavformat/hls.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 5057f4867e..203b086990 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -735,6 +735,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;
More information about the ffmpeg-cvslog
mailing list