har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: replace with av_dirname to get the directory

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2019-09-24 19:24:00 +08:00 committed by Steven Liu
parent 61aa77272a
commit 28bb73cee7
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/hlsenc.c
View File

@ -486,7 +486,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
float playlist_duration = 0.0f; float playlist_duration = 0.0f;
int ret = 0, path_size, sub_path_size; int ret = 0, path_size, sub_path_size;
int segment_cnt = 0; int segment_cnt = 0;
char *dirname = NULL, *p, *sub_path; char *dirname = NULL, *sub_path;
char *path = NULL; char *path = NULL;
char *vtt_dirname = NULL; char *vtt_dirname = NULL;
AVDictionary *options = NULL; AVDictionary *options = NULL;
@ -517,13 +517,8 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
} }
if (segment && !hls->use_localtime_mkdir) { if (segment && !hls->use_localtime_mkdir) {
dirname = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url); char *dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url);
if (!dirname) { dirname = (char*)av_dirname(dirname_r);
ret = AVERROR(ENOMEM);
goto fail;
}
p = (char *)av_basename(dirname);
*p = '\0';
} }
/* if %v is present in the file's directory /* if %v is present in the file's directory
@ -542,7 +537,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
} }
} }
av_free(dirname); av_freep(&dirname);
dirname = r_dirname; dirname = r_dirname;
} }
@ -578,13 +573,8 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
} }
if ((segment->sub_filename[0] != '\0')) { if ((segment->sub_filename[0] != '\0')) {
vtt_dirname = av_strdup(vs->vtt_avf->url); char *vtt_dirname_r = av_strdup(vs->vtt_avf->url);
if (!vtt_dirname) { vtt_dirname = (char*)av_dirname(vtt_dirname_r);
ret = AVERROR(ENOMEM);
goto fail;
}
p = (char *)av_basename(vtt_dirname);
*p = '\0';
sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname); sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname);
sub_path = av_malloc(sub_path_size); sub_path = av_malloc(sub_path_size);
if (!sub_path) { if (!sub_path) {