summaryrefslogtreecommitdiff
path: root/doc/demuxers.texi
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2021-07-28 12:38:08 +0200
committerNicolas George <george@nsup.org>2021-08-22 11:44:16 +0200
commit46fb395952be32692385449ee214461603480b4b (patch)
tree64b5d6911f90bc423628767884a793f5af2bce3f /doc/demuxers.texi
parent5b258c27702c3a58b9be2b23b074ad4c4355bdac (diff)
downloadffmpeg-46fb395952be32692385449ee214461603480b4b.tar.gz
libavformat/concatdec: remove support for unsafe=-1
It only makes sense as the default value, but it is not the default since 689211d5727231c3fe92762d224dbadebdbf4e30.
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r--doc/demuxers.texi9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 5b8cf1bfea..5f18e4551b 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -96,8 +96,7 @@ backslash or single quotes.
All subsequent file-related directives apply to that file.
@item @code{ffconcat version 1.0}
-Identify the script type and version. It also sets the @option{safe} option
-to 1 if it was -1.
+Identify the script type and version.
To make FFmpeg recognize the format automatically, this directive must
appear exactly as is (no extra space or byte-order-mark) on the very first
@@ -177,7 +176,8 @@ This demuxer accepts the following option:
@table @option
@item safe
-If set to 1, reject unsafe file paths. A file path is considered safe if it
+If set to 1, reject unsafe file paths and directives.
+A file path is considered safe if it
does not contain a protocol specification and is relative and all components
only contain characters from the portable character set (letters, digits,
period, underscore and hyphen) and have no period at the beginning of a
@@ -187,9 +187,6 @@ If set to 0, any file name is accepted.
The default is 1.
--1 is equivalent to 1 if the format was automatically
-probed and 0 otherwise.
-
@item auto_convert
If set to 1, try to perform automatic conversions on packet data to make the
streams concatenable.