From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH 2/4] avformat/hls: Check mime_ok first Date: Tue, 16 May 2023 02:49:16 +0200 Message-ID: <20230516004918.13505-2-michael@niedermayer.cc> (raw) In-Reply-To: <20230516004918.13505-1-michael@niedermayer.cc> This should be a few nano seconds faster (not measureable) But Collectively the whole humankind watching hls will safe a minute Found-by: Leo Izen Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 425df3b26b..fc29ef0ca9 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2541,9 +2541,9 @@ static int hls_probe(const AVProbeData *p) av_strcasecmp(p->mime_type, "application/x-mpegurl") ); - if (!av_match_ext (p->filename, "m3u8,hls,m3u") && - ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0 && - !mime_ok) { + if (!mime_ok && + !av_match_ext (p->filename, "m3u8,hls,m3u") && + ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) { av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n"); return 0; } -- 2.17.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".
next prev parent reply other threads:[~2023-05-16 0:49 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-16 0:49 [FFmpeg-devel] [PATCH 1/4] avformat/format: Remove redundant FFMIN() in ff_match_url_ext() Michael Niedermayer 2023-05-16 0:49 ` Michael Niedermayer [this message] 2023-05-16 0:49 ` [FFmpeg-devel] [PATCH 3/4] avformat/hls: Better message from hls_probe() Michael Niedermayer 2023-05-16 0:49 ` [FFmpeg-devel] [PATCH 4/4] avformat/hls: remove non standard hls extension Michael Niedermayer 2023-05-21 20:42 ` [FFmpeg-devel] [PATCH 1/4] avformat/format: Remove redundant FFMIN() in ff_match_url_ext() Michael Niedermayer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230516004918.13505-2-michael@niedermayer.cc \ --to=michael@niedermayer.cc \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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