From patchwork Sun Mar 29 03:14:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 18479 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 8214144A47E for ; Sun, 29 Mar 2020 06:15:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 559D068B4ED; Sun, 29 Mar 2020 06:15:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 907D868B1E5 for ; Sun, 29 Mar 2020 06:14:55 +0300 (EEST) X-QQ-mid: bizesmtp25t1585451687tgelvu7x Received: from localhost (unknown [114.245.17.93]) by esmtp10.qq.com (ESMTP) with id ; Sun, 29 Mar 2020 11:14:46 +0800 (CST) X-QQ-SSF: 01100000002000K0ZTF0000A0000000 X-QQ-FEAT: lhZJkI00zscBokEjeuT92M5krR9qlRdhxtLDs7am1agShVCTWcdiU6ZKFuv1J FZv8fl0RIi3zeh/B2QQsDjwH8JIXtd9zjrK+RqbQH+FoSi20VTZwk0UfBOhdHjGA2lq8YZK DPyuqri+BK4kKIoMpprL8NjVXvHT+e/TXBWK1CWliUbLLGChA5p8l2JGwanCUJXDmiG+fBj q7Og+T83qIS0p7hQ2HxIk37TYd4btFlnVtFAu+neUOMf5GGIvBmeSCbdYcjTAaVk2hZai5M oMAXSQE34gcL3s6BfCtdYgGNioMQrDdZhBwAy2QXKgtxHR+BUUjfdvkD5dREiTAFVQxwH4p 3eAvGyz X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Mar 2020 11:14:37 +0800 Message-Id: <20200329031437.68210-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: skip first char after compare path with path separator 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 , Ibrahim Tachijian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" before patch: ffmpeg -i input -g 25 -y -c:a aac -map 0:v -map 0:a -master_pl_name playlist.m3u8 -var_stream_map "v:0,a:0" c%v.m3u8" the master file playlist.m3u8 context is #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=2890800,RESOLUTION=1920x800,CODECS="avc1.640028,mp4a.40.2" /c0.m3u8 this is incorrect. after patch: #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=2890800,RESOLUTION=1920x800,CODECS="avc1.640028,mp4a.40.2" c0.m3u8 Reported-by: Ibrahim Tachijian 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 b4c72b6e54..a3c59432c5 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur } } - return media_url + base_len; + return media_url + 1 + base_len; } static int64_t get_stream_bit_rate(AVStream *stream)