diff mbox series

[FFmpeg-devel] avformat/hlsenc: skip first char after compare path with path separator

Message ID 20200329031437.68210-1-lq@chinaffmpeg.org
State New
Headers show
Series [FFmpeg-devel] avformat/hlsenc: skip first char after compare path with path separator
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Steven Liu March 29, 2020, 3:14 a.m. UTC
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 <ibrahim@netsat.se>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/hlsenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Limin Wang March 29, 2020, 8:04 a.m. UTC | #1
On Sun, Mar 29, 2020 at 11:14:37AM +0800, Steven Liu wrote:
> 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
> 

I have send patch set to fix the issue before. Please see:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200326135700.11167-1-lance.lmwang@gmail.com/


> Reported-by: Ibrahim Tachijian <ibrahim@netsat.se>
> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
> ---
>  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)
> -- 
> 2.25.0
> 
> 
> 
> _______________________________________________
> 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".
diff mbox series

Patch

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)