eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/hlsenc: fix write wrong init file URI string problem

Browse Source 
fmp4_init_filename should append after base_output_dirname

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu
2018-03-18 14:07:00 +08:00
parent 08e0f45cc8
commit a92ca3c07c
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/hlsenc.c
View File

@@ -2583,21 +2583,6 @@ static int hls_init(AVFormatContext *s)
} }
av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename,
fmp4_init_filename_len); fmp4_init_filename_len);
if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) {
ret = format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i);
if (ret < 0)
goto fail;
fmp4_init_filename_len = strlen(vs->fmp4_init_filename) + 1;
vs->base_output_dirname = av_malloc(fmp4_init_filename_len);
if (!vs->base_output_dirname) {
ret = AVERROR(ENOMEM);
goto fail;
}
av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename,
fmp4_init_filename_len);
} else {
if (hls->nb_varstreams > 1) { if (hls->nb_varstreams > 1) {
ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i);
if (ret < 0) if (ret < 0)
@@ -2625,7 +2610,6 @@ static int hls_init(AVFormatContext *s)
fmp4_init_filename_len); fmp4_init_filename_len);
} }
} }
}
if (!hls->use_localtime) { if (!hls->use_localtime) {
ret = sls_flag_check_duration_size_index(hls); ret = sls_flag_check_duration_size_index(hls);