RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Bela Bodecs 2019-06-22 15:55:54 +02:00 committed by Steven Liu
parent bc3306fd5b
commit 2045dd0050
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/muxers.texi
View File

@ -656,7 +656,8 @@ This example will produce the playlists segment file sets:
@file{file_1_000.ts}, @file{file_1_001.ts}, @file{file_1_002.ts}, etc.
The string "%v" may be present in the filename or in the last directory name
containing the file. If the string is present in the directory name, then
containing the file, but only in one of them. (Additionally, %v may appear multiple times in the last
sub-directory or filename.) If the string %v is present in the directory name, then
sub-directories are created after expanding the directory name pattern. This
enables creation of segments corresponding to different variant streams in
subdirectories.

8
libavformat/hlsenc.c
View File

@ -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;
}