From patchwork Tue May 16 00:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp61294pzb; Mon, 15 May 2023 17:49:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ624x25Zh2yd87JEcg/FHcDaQCH0Q3h3G0FwtRhytZnfk7+YXqfoeUrG2BLMdq+9Qbz9pam X-Received: by 2002:a17:907:8a16:b0:96a:2cd7:5085 with SMTP id sc22-20020a1709078a1600b0096a2cd75085mr20507736ejc.44.1684198172097; Mon, 15 May 2023 17:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684198172; cv=none; d=google.com; s=arc-20160816; b=A3bmXnt5R0ph/5oGhN3HSAsXw17m7dVpnGUgdirmLNmD4hgSwk9XQl2S4DxbkcvJSW quI/QTsJj675tzqpDX03AfCcFAlUC8w8dVaDrQTyTwLF0SrfAxA1Q5XYvNVTbqZ+nDCy WebAJTw9/fbetSW4Vq4+O7LFv0Jhs7NLdMefjGIH8o36YH57Zbt4FmV1IoIq1sLHsnMn Tl9ms+iRpUXRkW97n0RWLKBgipK1X5ubFlL0DfWKe8Bh4YNdvH/MWkVPeMhGuIQ3FU0b LTjj1voQgnLmRtwK+i/xmsGNaJfip/2TegpnjboQVAyxKcx7l4I4waVMB3aW3tEzb5+i xmQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=KWX93v/ZxWTNreEjYF/EDgecuADC8mKKKExoDA4PZrE=; b=u3jXbUKfaoZuSBnMWBTI7Np48zlXSNrZqnlVeRMLLzPCfeUhWBGNzaWJuCn8TXj11j lVh7JklSVACOGD0/ZCjWEM7TCPAD+e4NOEk0S+RGkMzSlw/3pPMkpoONGT6qhbMaThk5 MlyJquGp45XitH9fX2VCl5m8BVp9LgUx7+2zJ+U1TmULcEuHfNeh/IgBf4P//N+u+3h6 /01AExAeyxeBtG5guqptHBUUT1HKChaklgfj5Z0vWUbwK0GRspw4iNWSh694HSyPIvSp VrI9XSM1fRUVfGkNPzGt53e+cPHV9Tfq1c/yfrR2uLr3CRS+u61qbyv3+qxW9AJUqDCS mAmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d23-20020aa7ce17000000b00506b24cf626si13244066edv.82.2023.05.15.17.49.31; Mon, 15 May 2023 17:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8502868BF1E; Tue, 16 May 2023 03:49:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2910168BFA5 for ; Tue, 16 May 2023 03:49:19 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 150BEE0004 for ; Tue, 16 May 2023 00:49:18 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 May 2023 02:49:15 +0200 Message-Id: <20230516004918.13505-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/format: Remove redundant FFMIN() in ff_match_url_ext() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LcpDl9l1SqfO Found-by: Leo Izen Signed-off-by: Michael Niedermayer --- libavformat/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/format.c b/libavformat/format.c index d9135854de..c91f71057a 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -70,7 +70,7 @@ int ff_match_url_ext(const char *url, const char *extensions) return 0; if (uc.query - ext > sizeof(scratchpad)) return AVERROR(ENOMEM); //not enough memory in our scratchpad - av_strlcpy(scratchpad, ext + 1, FFMIN(sizeof(scratchpad), uc.query - ext)); + av_strlcpy(scratchpad, ext + 1, uc.query - ext); return av_match_name(scratchpad, extensions); } From patchwork Tue May 16 00:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp61346pzb; Mon, 15 May 2023 17:49:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4JhYePsHzC6CALeS9T6V4kiJoW2aZ4hJnP0EbwLWtLMemGltFkwwo5qLufDEi+uhJXybYU X-Received: by 2002:a17:907:2d0c:b0:966:5c04:2c5a with SMTP id gs12-20020a1709072d0c00b009665c042c5amr28405819ejc.69.1684198181861; Mon, 15 May 2023 17:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684198181; cv=none; d=google.com; s=arc-20160816; b=X+stX/iS3Xt/hrDuvLSU0aj1pH90TJCC4VjZ3sVcZlITPJ+ui+iW/TBD2A5HW5AAPg MHCeDHPcsV9VrwefW3mmc5pFRFLhovTyl8dOI85mMmf89cc2YfZUfaX59Hc/OBNT7WOD BXAsIDJ6qOhrA6BEG8MLe7vAqU+9QAzxIb3Umy6I2cW7En0rvDxz9ydjVW5J7utA82Hi WVHao1s8GYRW1mvURlN9y/1XsOiX6v6yMysa7fI/WZ2V6wHeeI/3JxgGiA5FB2KM/k/m 0ahT2pEk1S+OXf4n6vp8dJBdNh1nQl3fLNCAmxj2Rh0+99AIhg/iydUFN9QD/FyL6XMq rQtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Q+km56hN4Omg2e6o2ox1z5B1CPJUlvDlayCWeGwbNZU=; b=RoLGF7yX3xoxZDME6oONUtI/zB2QfSF27Xf6n59YjoKiilPeLiuvH5C86Dh32umiL6 zJYTMROtXJ9cRk+TqC+JU0B8jzT7Es5Zz3vpoRdI0yc5JToYsdQTqTay/JaU8OvHUwps VkrUP/x4ttHdP4AV10Ey4fLndS1lZQoVc3nL5imyPU7DVj5SpMn99cFwAYAgzW+txF4o EDMOE+pOdRT8cPanzBoI9JRH4mLSPFJPGZREllxwTQMhpzZ6U9QMaEK7Yb3FkEIGB/ev SD3gcQ9BqKt2nTTS/7rVbVuUFWRrXsmnPtDvpyRC5fJmo/EI7bihUwucAa171FqfZjbb bdpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id va2-20020a17090711c200b009665a49fc65si13445724ejb.961.2023.05.15.17.49.41; Mon, 15 May 2023 17:49:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A184868BFEB; Tue, 16 May 2023 03:49:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFC1D68BEBD for ; Tue, 16 May 2023 03:49:20 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 1483CC0002 for ; Tue, 16 May 2023 00:49:19 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 May 2023 02:49:16 +0200 Message-Id: <20230516004918.13505-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230516004918.13505-1-michael@niedermayer.cc> References: <20230516004918.13505-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] avformat/hls: Check mime_ok first 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FbQzntXVXx7/ 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 --- 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; } From patchwork Tue May 16 00:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp61403pzb; Mon, 15 May 2023 17:49:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5tsQ9eLDIzBeFMsXEfZa+MYG/aJqZLTOtlq2ZoQmrzexhVdSDw45/xdJXTToVk2EMcLugY X-Received: by 2002:a17:907:d23:b0:957:12b6:8918 with SMTP id gn35-20020a1709070d2300b0095712b68918mr35142361ejc.75.1684198190193; Mon, 15 May 2023 17:49:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684198190; cv=none; d=google.com; s=arc-20160816; b=v2XpcdueAp7vIsoO9n/P+ZiMJxZgq3Tu0C2pAhIjFZr7dLbNh/SZCsjoIhNLtuZU8n f1LteLwivheMxzfc+MEhY4u67O8b9Y3biBfg4rJdPeRNF2gcaudA9q4vfIElAtcoyGeC vVpBsA9uuo/pZyMuNa/t84MDNmH5Ei2ZcBhT7o7hqdBOoBJ/U/SIjlpob6ZKcXK0jHPU TxsTFsn5yseZHAlTk1sbEkWj75L50R7WrK5W2MuYBpSRtbiFBlF10ImR/eSYHEDFQxTO P5Wqna8l2u3NhCT/gs+OiuhR0+U9azGWZkxoyhu/HQVan9SPYHID+YrHKhbf/g/n1hfA xdPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Iai5qYSh0byfxgV2Jzea4CYT1YS6p5fUuVgmgpqxHjc=; b=uT7kYHXGlEk7pXpf3TMu/72Q2DwoEqssnXdCob4JtX5EEiaGj5NHhJeRp9yFbKMLU4 2HKU7iTa7PMli+9QJAdvOD9tfEajGPv7FGM41SYboLUWXSJwCp8uqs6vq9NQPaKsO1vD F8gQsb5UL6u4LHeocJznvEmSvMPZO+iUFKD9FyQ0z1PbtpdBanaGoFr+rKIUxyQ9BpJK ywum7oHvfxuhUmYe4cjJL3GJrHvbRa5aF8u46Pfg6R1WzK/KaSBkGSW9hWcbCOrHBsP0 ifVmN8IRLASmqjL11dawDKAmzAkUFzlLwWEIfdgOBW78LJqP2Zta4DoblhZtXiroCgej dVPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb7-20020a1709076d8700b00969f7861d71si16835181ejc.873.2023.05.15.17.49.49; Mon, 15 May 2023 17:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B88D568C001; Tue, 16 May 2023 03:49:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 E6A2668BFC8 for ; Tue, 16 May 2023 03:49:21 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 30F301BF206 for ; Tue, 16 May 2023 00:49:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 May 2023 02:49:17 +0200 Message-Id: <20230516004918.13505-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230516004918.13505-1-michael@niedermayer.cc> References: <20230516004918.13505-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avformat/hls: Better message from hls_probe() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Yc1T+gEddM5v Found-by: Kacper Michajlow Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index fc29ef0ca9..2bc142510e 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2536,17 +2536,23 @@ static int hls_probe(const AVProbeData *p) int mime_ok = p->mime_type && !( av_strcasecmp(p->mime_type, "application/vnd.apple.mpegurl") && - av_strcasecmp(p->mime_type, "audio/mpegurl") && + av_strcasecmp(p->mime_type, "audio/mpegurl") + ); + + int mime_x = p->mime_type && !( av_strcasecmp(p->mime_type, "audio/x-mpegurl") && av_strcasecmp(p->mime_type, "application/x-mpegurl") ); if (!mime_ok && + !mime_x && !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"); + av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension and non standard mime type\n"); return 0; } + if (mime_x) + av_log(NULL, AV_LOG_WARNING, "mime type is not rfc8216 compliant\n"); return AVPROBE_SCORE_MAX; } From patchwork Tue May 16 00:49:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41641 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp61447pzb; Mon, 15 May 2023 17:49:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Fut+cbI5bXKiM/jYToBYE2mYnCpaJR5o5xte9yaC2m148cB6ESRVrc+8ND9L7l4LfwfH3 X-Received: by 2002:a17:907:a410:b0:96a:90bb:a2d3 with SMTP id sg16-20020a170907a41000b0096a90bba2d3mr14802901ejc.71.1684198198181; Mon, 15 May 2023 17:49:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684198198; cv=none; d=google.com; s=arc-20160816; b=MUXoOJJ8Wa3Ynhq+BIpKwkqb8gg6Kbc/zSkgJnGsMVhZNqYhhKm63FIj8hVC3VBYG7 MNypR35GXdcxEuzOowF1wODlSH8sCw71WMH3HYcz/u3OOzSTzwTb3Iy7+KdR84M3/IwQ ksptJig4Mx9wgUivVaRYcz20y7K2fJ8JlV95B5B2WdSwxWJmEYE7Aih7K7uaAiYz+3zE HkGjDBJXAmmJM6yMe6zKUzaOHUFAKv3XPLBFp3GsHkwIwcnTR+kFVTP9od91rPcp5jtC nRdDkFATjnn2rHd19hJZRsW7uDMnLd09AQsj5DrKgN29iV34V34x+ZT6O/grsIWIel1h s9Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=ZihLFO4jwkfVljGqpkprnah+O+W3DbMnhbtaRZGPrEk=; b=ucvyo05nc/iHRTynzJPghQQ16YzeFH49x6PkOGY4NQVvQ9s/meNPpvhbHRrPY9xFEn AXAmRsBfLQk5oIc1+zNk5FhCmumqSewhaaLVHdPUEziyWiaE+ZBRpo0hsmyBAS1mwd00 AgUpA4rnnwPzngy9hAW7heczWxSJbAmvJmJcYB8UdiyVIkByRrLWKuxI51GEI891jBa1 RAp1KA/ZSaNh8gjzpz5/+Nza0k6qAYNC0esNN2xH+Farlydveo+7pQyQ8nmONoG/49e3 ILo6aP0qy1yq7A4SRuS629PYEtOwSGCECa2ZTobuoNFAWlz6ryR/aBBmWetuLfmbcu6O pHtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gq6-20020a170906e24600b0094f3ca074afsi11898022ejb.305.2023.05.15.17.49.57; Mon, 15 May 2023 17:49:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E73AA68BFE0; Tue, 16 May 2023 03:49:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8418768BFEA for ; Tue, 16 May 2023 03:49:22 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E916CC0004 for ; Tue, 16 May 2023 00:49:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 May 2023 02:49:18 +0200 Message-Id: <20230516004918.13505-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230516004918.13505-1-michael@niedermayer.cc> References: <20230516004918.13505-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avformat/hls: remove non standard hls extension 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gzqB4i4a2tMQ Suggested-by: Kacper Michajlow Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 2bc142510e..4fff4405e8 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2546,8 +2546,8 @@ static int hls_probe(const AVProbeData *p) if (!mime_ok && !mime_x && - !av_match_ext (p->filename, "m3u8,hls,m3u") && - ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) { + !av_match_ext (p->filename, "m3u8,m3u") && + ff_match_url_ext(p->filename, "m3u8,m3u") <= 0) { av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension and non standard mime type\n"); return 0; }