On Thu, Feb 06, 2025 at 08:17:05PM +0800, Steven Liu wrote:
> Michael Niedermayer <mich...@niedermayer.cc> 于2025年2月6日周四 20:10写道:
> >
> > Allow mp4 with all mpegts extensions
> >
> > Fixes: Ticket11435
> >
> > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> > ---
> >  libavformat/hls.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/hls.c b/libavformat/hls.c
> > index 8eae64b787e..3bdc1bc8489 100644
> > --- a/libavformat/hls.c
> > +++ b/libavformat/hls.c
> > @@ -755,8 +755,8 @@ static int test_segment(AVFormatContext *s, const 
> > AVInputFormat *in_fmt, struct
> >              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);
> > +                matchF |=      av_match_ext(    seg->url, 
> > "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts")
> > +                          + 2*(ff_match_url_ext(seg->url, 
> > "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts") > 0);
> >              }
> >          } else if (!strcmp(in_fmt->name, "mpegts")) {
> >              matchF =      av_match_ext(    seg->url, 
> > "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts")
> > --
> > 2.48.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".
> 
> LGTM

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Some people wanted to paint the bikeshed green, some blue and some pink.
People argued and fought, when they finally agreed, only rust was left.

Attachment: signature.asc
Description: PGP signature

_______________________________________________
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".

Reply via email to