aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-08-03 20:35:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-04 23:22:54 +0200
commitdd96a5847319db8aecf9819336611fff04cb2941 (patch)
tree44b402580aac7035c6cc0659157a587342c590b2
parent82a33c8d858498fc4e0b8ab93ad323a05dfd5168 (diff)
downloadffmpeg-dd96a5847319db8aecf9819336611fff04cb2941.tar.gz
avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/hlsenc.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 5dc518d9ad..9f076ba539 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -561,14 +561,16 @@ static int hls_start(AVFormatContext *s)
}
av_free(fn_copy);
}
- } else if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
- c->basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0) {
+ } else if (av_get_frame_filename2(oc->filename, sizeof(oc->filename),
+ c->basename, c->wrap ? c->sequence % c->wrap : c->sequence,
+ AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try use -use_localtime 1 with it\n", c->basename);
return AVERROR(EINVAL);
}
if( c->vtt_basename) {
- if (av_get_frame_filename(vtt_oc->filename, sizeof(vtt_oc->filename),
- c->vtt_basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0) {
+ if (av_get_frame_filename2(vtt_oc->filename, sizeof(vtt_oc->filename),
+ c->vtt_basename, c->wrap ? c->sequence % c->wrap : c->sequence,
+ AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", c->vtt_basename);
return AVERROR(EINVAL);
}