Skip to content

Commit 880007e

Browse files
committed
avformat/hls: .ts is always ok even if its a mov/mp4
Maybe fixes: 11435 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9e12572) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
1 parent c74740f commit 880007e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

libavformat/hls.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,10 @@ static int test_segment(AVFormatContext *s, const AVInputFormat *in_fmt, struct
754754
if (in_fmt->extensions) {
755755
matchF = av_match_ext( seg->url, in_fmt->extensions)
756756
+ 2*(ff_match_url_ext(seg->url, in_fmt->extensions) > 0);
757+
if(av_match_name("mp4", in_fmt->name)) {
758+
matchF |= av_match_ext( seg->url, "ts")
759+
+ 2*(ff_match_url_ext(seg->url, "ts") > 0);
760+
}
757761
} else if (!strcmp(in_fmt->name, "mpegts"))
758762
matchF = 3;
759763

0 commit comments

Comments
 (0)