diff options
author | Bela Bodecs <bodecsb@vivanet.hu> | 2019-06-22 15:55:54 +0200 |
---|---|---|
committer | Steven Liu <lq@chinaffmpeg.org> | 2019-06-24 17:43:39 +0800 |
commit | 2045dd0050f1ef0df348e11bd44657c2475aa7c3 (patch) | |
tree | 21fd339c2bd1216dd0b262b2784bea0a916f037e /libavformat | |
parent | bc3306fd5b272730bb4bc2c571d575fed75a1ce4 (diff) | |
download | ffmpeg-2045dd0050f1ef0df348e11bd44657c2475aa7c3.tar.gz |
avformat/hlsenc: better error log message for var_stream_map content
When multiple variant streams are specified by var_stream_map option,
%v is expected either in the filename or in the last sub-directory name,
but only in one of them. When both of them contains %v string, current
error message only states half of the truth.
And even %v may appears several times inside the last sub-directory name
or in filename pattern.
This patch clarifies this in the log message and in the doc also.
Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/hlsenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6330ec2d5..9f5eee5491 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1792,15 +1792,15 @@ static int validate_name(int nb_vs, const char *fn) subdir_name = av_dirname(fn_dup); if (nb_vs > 1 && !av_stristr(filename, "%v") && !av_stristr(subdir_name, "%v")) { - av_log(NULL, AV_LOG_ERROR, "More than 1 variant streams are present, %%v is expected in the filename %s\n", - fn); + av_log(NULL, AV_LOG_ERROR, "More than 1 variant streams are present, %%v is expected " + "either in the filename or in the sub-directory name of file %s\n", fn); ret = AVERROR(EINVAL); goto fail; } if (av_stristr(filename, "%v") && av_stristr(subdir_name, "%v")) { - av_log(NULL, AV_LOG_ERROR, "%%v is expected either in filename or in the sub-directory name of file %s\n", - fn); + av_log(NULL, AV_LOG_ERROR, "%%v is expected either in the filename or " + "in the sub-directory name of file %s, but only in one of them\n", fn); ret = AVERROR(EINVAL); goto fail; } |