Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avformat/hls: Fix twitter
@ 2025-02-06 12:10 Michael Niedermayer
  2025-02-06 12:17 ` Steven Liu
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Niedermayer @ 2025-02-06 12:10 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Allow mp4 with all mpegts extensions

Fixes: Ticket11435

Signed-off-by: Michael Niedermayer <michael@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-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [FFmpeg-devel] [PATCH] avformat/hls: Fix twitter
  2025-02-06 12:10 [FFmpeg-devel] [PATCH] avformat/hls: Fix twitter Michael Niedermayer
@ 2025-02-06 12:17 ` Steven Liu
  0 siblings, 0 replies; 2+ messages in thread
From: Steven Liu @ 2025-02-06 12:17 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Michael Niedermayer <michael@niedermayer.cc> 于2025年2月6日周四 20:10写道:
>
> Allow mp4 with all mpegts extensions
>
> Fixes: Ticket11435
>
> Signed-off-by: Michael Niedermayer <michael@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-request@ffmpeg.org with subject "unsubscribe".

LGTM

Thanks
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-02-06 12:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-06 12:10 [FFmpeg-devel] [PATCH] avformat/hls: Fix twitter Michael Niedermayer
2025-02-06 12:17 ` Steven Liu

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git