From 9ec1f7634a621b0fda6d814f730c270c6e22b251 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sat, 19 Jan 2019 14:59:44 +0800 Subject: [PATCH] avformat/hlsenc: fix fmp4_init_filename file name with %v problem when set option fmp4_init_filename to init_%v.mp4 before patch: the init file will be init_%v_0.mp4, init_%v_1.mp4 after patch: the init file will be init_0.mp4, init_1.mp4 Reported-By: Gyan Doshi Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d91960d752..258d0628ba 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2740,7 +2740,11 @@ static int hls_init(AVFormatContext *s) av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, fmp4_init_filename_len); if (hls->nb_varstreams > 1) { - ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); + if (av_stristr(vs->fmp4_init_filename, "%v")) { + format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i); + } else { + ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); + } if (ret < 0) goto fail; }