virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bug

Browse Source 
fix ticket id: #6777
when use argument hls_segment_filename, the basename_size will be 0

Signed-off-by: Steven Liu <lq@onvideo.cn>
This commit is contained in:
Steven Liu 2017-10-29 12:30:44 +08:00
parent ca2b779423
commit f520830761
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/hlsenc.c
View File

@ -1335,6 +1335,7 @@ static int hls_write_header(AVFormatContext *s)
AVDictionary *options = NULL;
int basename_size = 0;
int vtt_basename_size = 0;
int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1;
if (hls->segment_type == SEGMENT_TYPE_FMP4) {
pattern = "%d.m4s";
@ -1445,7 +1446,6 @@ static int hls_write_header(AVFormatContext *s)
}
if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) {
int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1;
hls->base_output_dirname = av_malloc(fmp4_init_filename_len);
if (!hls->base_output_dirname) {
ret = AVERROR(ENOMEM);
@ -1453,19 +1453,25 @@ static int hls_write_header(AVFormatContext *s)
}
av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, fmp4_init_filename_len);
} else {
hls->base_output_dirname = av_malloc(basename_size);
if (basename_size > 0) {
hls->base_output_dirname = av_malloc(basename_size);
} else {
hls->base_output_dirname = av_malloc(strlen(hls->fmp4_init_filename));
}
if (!hls->base_output_dirname) {
ret = AVERROR(ENOMEM);
goto fail;
}
av_strlcpy(hls->base_output_dirname, s->filename, basename_size);
p = strrchr(hls->base_output_dirname, '/');
if (basename_size > 0) {
av_strlcpy(hls->base_output_dirname, s->filename, basename_size);
p = strrchr(hls->base_output_dirname, '/');
}
if (p) {
*(p + 1) = '\0';
av_strlcat(hls->base_output_dirname, hls->fmp4_init_filename, basename_size);
} else {
av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, basename_size);
av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, fmp4_init_filename_len);
}
}