From patchwork Fri Jan 10 14:51:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 17278 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8D7F644AE9B for ; Fri, 10 Jan 2020 16:51:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A8CF68A706; Fri, 10 Jan 2020 16:51:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BEAB68A706 for ; Fri, 10 Jan 2020 16:51:34 +0200 (EET) X-QQ-mid: bizesmtp29t1578667885tpchs19k Received: from localhost (unknown [222.129.169.92]) by esmtp10.qq.com (ESMTP) with id ; Fri, 10 Jan 2020 22:51:24 +0800 (CST) X-QQ-SSF: 01100000002000K0ZSF0B00A0000000 X-QQ-FEAT: Q+CxUL1BHVlGr44XuI096eiwf+WuPjn/SLgRCsAqISbNGhrePpDXruXmztIVa DEpqGuvFPhMeglRcTZjkSDwY4g/s+3hjQpuSO8nl8ltZdlGsJVpr8EB8ABXeKPpt3YQWNUa KrOfRAshZPoPrtTCthEXr5Rje4z3pf3LIRcei5k2Sa1pvtd38i2H5opcPsuIxsToFnQPmpp XNEgP/aBicXAkM2ryr+KY4L0rtmtFH1QV852lYg94IQu/qmGoqflZj7dO773z1MvwV8C3D6 UWCbX6Y13PwWwIRzaLnAJYz3acF47o0/odzHoazmJM1ag3 X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jan 2020 22:51:22 +0800 Message-Id: <20200110145122.28052-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign6 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: compare without the last directory separator in get_relative_url X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 8461 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d130f03ea6..e87f08b0e6 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1234,7 +1234,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur if (!p) p = strrchr(master_url, '\\'); if (p) { - base_len = p + 1 - master_url; + base_len = p - master_url; if (av_strncasecmp(master_url, media_url, base_len)) { av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n"); return NULL;