From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id ADA5E48A8D for ; Tue, 28 Jan 2025 14:24:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C321E68B7CC; Tue, 28 Jan 2025 16:24:30 +0200 (EET) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4411168A9D3 for ; Tue, 28 Jan 2025 16:24:24 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 88E661BF208 for ; Tue, 28 Jan 2025 14:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1738074263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T4mgG2KdpxNKqnABBdQoQUaAVx8GBgkEs1MGsxH/Mfs=; b=HVmOZKcGhFRMdL5qdpUeAi7OSns7XLCckDspIqkGWo6tM8ynAJm60plV/j3Oh30qRjlheC SO4YPRdbHdbH7mHOZwE9mzM2PFamTSQ/Eh2+7qv7bRLXEz745zTE/ydXfEhbn4Fax9BrjH hAI7Yv8OyZmNazB73MZrl1a1kybZQpJCOoEZMTbLVZNPnfPAbLIltLSlYajqy4Oc3Wl6xQ H5DEYE5MU22Cxcm73Gqsm1EyXXw5PVGwXfsrgbcT4N1nMAvcQPJ4YuEnB16k1WOsAMrHhn MVuXcqvKwcLPr79jMGmRq7a5hE3kxKlnOthHXmirnC1ASCZhjAhe2iQaXQDnQw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 28 Jan 2025 15:24:21 +0100 Message-ID: <20250128142421.337241-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250128142421.337241-1-michael@niedermayer.cc> References: <20250128142421.337241-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hls: .ts is always ok even if its a mov/mp4 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Maybe fixes: 11435 Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index d2787ade46b..bdc3f5dbed5 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -754,6 +754,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(!strcmp(in_fmt->name, "mov,mp4,m4a,3gp,3g2,mj2")) { + 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; -- 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".