diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-01 22:58:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-01 23:03:24 +0100 |
| commit | 2b09a3ad19520bc3ae9adcff5506ac1f628406b4 (patch) | |
| tree | e281db1847c3a63fa08c1a14ec949e6215102385 /libavformat/hlsenc.c | |
| parent | 6f2ad32a167ce4e0fd9ac8b38054a297c6463067 (diff) | |
| download | ffmpeg-2b09a3ad19520bc3ae9adcff5506ac1f628406b4.tar.gz | |
Revert "img2 encoder: allow %t in filename, based on patch from Yuval Adam"
breaks API
Found-by: jamrial
This reverts commit 1a956c64c8eff5edecb004fc7aafd21207e6485c.
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 02d8d444c7..9ca2df7bf2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -654,7 +654,7 @@ static int hls_start(AVFormatContext *s) } else if (c->max_seg_size > 0) { 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) < 0) { + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -use_localtime 1 with it\n", c->basename); return AVERROR(EINVAL); } @@ -685,14 +685,14 @@ static int hls_start(AVFormatContext *s) } } 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) < 0) { + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -use_localtime 1 with it\n", c->basename); return AVERROR(EINVAL); } if( c->vtt_basename) { 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) < 0) { + 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); } |