highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/concatdec: add signature directive.

Browse Source
This commit is contained in:
Nicolas George 2013-02-03 10:22:57 +01:00
parent 6d680d20ad
commit db9dc5154d
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/demuxers.texi
View File

@ -58,6 +58,10 @@ following directive is recognized:
Path to a file to read; special characters and spaces must be escaped with Path to a file to read; special characters and spaces must be escaped with
backslash or single quotes. backslash or single quotes.
@item @code{ffconcat version 1.0}
Identify the script type and version. It also sets the @option{safe} option
to 1 if it was to its default -1.
@end table @end table
@subsection Options @subsection Options

9
libavformat/concatdec.c
View File

@ -173,6 +173,15 @@ static int concat_read_header(AVFormatContext *avf)
} }
if ((ret = add_file(avf, filename, &file, &nb_files_alloc)) < 0) if ((ret = add_file(avf, filename, &file, &nb_files_alloc)) < 0)
FAIL(ret); FAIL(ret);
} else if (!strcmp(keyword, "ffconcat")) {
char *ver_kw = get_keyword(&cursor);
char *ver_val = get_keyword(&cursor);
if (strcmp(ver_kw, "version") || strcmp(ver_val, "1.0")) {
av_log(avf, AV_LOG_ERROR, "Line %d: invalid version\n", line);
FAIL(AVERROR_INVALIDDATA);
}
if (cat->safe < 0)
cat->safe = 1;
} else { } else {
av_log(avf, AV_LOG_ERROR, "Line %d: unknown keyword '%s'\n", av_log(avf, AV_LOG_ERROR, "Line %d: unknown keyword '%s'\n",
line, keyword); line, keyword);