summaryrefslogtreecommitdiffstats
path: root/libavformat/hlsenc.c
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2018-03-18 14:07:00 +0800
committerSteven Liu <lq@chinaffmpeg.org>2018-03-18 19:05:05 +0800
commita92ca3c07c89855d46c801ef05428b5d86a1b30c (patch)
tree32ba6d4eaeba29f5b32248b95e40280c702465bb /libavformat/hlsenc.c
parent08e0f45cc88903967da5a76e18be45d7406397f7 (diff)
downloadffmpeg-streaming-a92ca3c07c89855d46c801ef05428b5d86a1b30c.zip
ffmpeg-streaming-a92ca3c07c89855d46c801ef05428b5d86a1b30c.tar.gz
avformat/hlsenc: fix write wrong init file URI string problem
fmp4_init_filename should append after base_output_dirname Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'libavformat/hlsenc.c')
-rw-r--r--libavformat/hlsenc.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 58d403d..3df0784 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -2583,21 +2583,6 @@ static int hls_init(AVFormatContext *s)
}
av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename,
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) {
ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i);
if (ret < 0)
@@ -2624,7 +2609,6 @@ static int hls_init(AVFormatContext *s)
av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename,
fmp4_init_filename_len);
}
- }
}
if (!hls->use_localtime) {
OpenPOWER on IntegriCloud