[FFmpeg-cvslog] avformat/hlsenc: compare without the last directory separator in get_relative_url

Steven Liu git at videolan.org
Mon Jan 20 08:28:45 EET 2020


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Fri Jan 10 22:51:22 2020 +0800| [bc0bedf3c950fc5203d0d2b62019fb49edc48fb7] | committer: Steven Liu

avformat/hlsenc: compare without the last directory separator in get_relative_url

fix ticket: 8461
there is no problem before commit 75aea52a1051a22bdebd0b7a8098ac6479a529a0

Reviewed-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc0bedf3c950fc5203d0d2b62019fb49edc48fb7
---

 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;



More information about the ffmpeg-cvslog mailing list