virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/hlsenc: Simplify setting subtitle basename with av_asprintf

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-04-08 22:57:50 +02:00
parent 940601616e
commit 6b44f6839d
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/hlsenc.c
View File

@@ -2743,9 +2743,8 @@ static int hls_init(AVFormatContext *s)
VariantStream *vs = NULL; VariantStream *vs = NULL;
int basename_size = 0; int basename_size = 0;
const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s);
const char *vtt_pattern = "%d.vtt"; const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt";
char *p = NULL; char *p = NULL;
int vtt_basename_size = 0;
int http_base_proto = ff_is_http_proto(s->url); int http_base_proto = ff_is_http_proto(s->url);
int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1;
@@ -2954,28 +2953,25 @@ static int hls_init(AVFormatContext *s)
if (!vs->vtt_oformat) if (!vs->vtt_oformat)
return AVERROR_MUXER_NOT_FOUND; return AVERROR_MUXER_NOT_FOUND;
if (hls->flags & HLS_SINGLE_FILE) p = strrchr(vs->m3u8_name, '.');
vtt_pattern = ".vtt";
vtt_basename_size = strlen(vs->m3u8_name) + strlen(vtt_pattern) + 1;
vs->vtt_basename = av_malloc(vtt_basename_size);
if (!vs->vtt_basename)
return AVERROR(ENOMEM);
av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size);
p = strrchr(vs->vtt_basename, '.');
if (p) if (p)
*p = '\0'; *p = '\0';
vs->vtt_basename = av_asprintf("%s%s", vs->m3u8_name, vtt_pattern);
if (!vs->vtt_basename)
return AVERROR(ENOMEM);
if (hls->subtitle_filename) { if (hls->subtitle_filename) {
ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname); ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename); vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->m3u8_name);
if (!vs->vtt_m3u8_name) if (!vs->vtt_m3u8_name)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size); if (p)
*p = '.';
} }
if (hls->baseurl) { if (hls->baseurl) {