diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-19 22:13:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-10 02:54:59 +0100 |
| commit | 689211d5727231c3fe92762d224dbadebdbf4e30 (patch) | |
| tree | eac403c4614523f6a4dc3c075d56b2a39ee451dc /doc | |
| parent | caeed0479fca143ed4206f4a8f2c5935f7e5f2a0 (diff) | |
| download | ffmpeg-689211d5727231c3fe92762d224dbadebdbf4e30.tar.gz | |
avformat/concatdec: set safe mode to enabled instead of auto
This is safer, as a selected demuxer could still mean that it was auto-detected
by a user application
Reviewed-previously-by: Nicolas George <george@nsup.org>
Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/demuxers.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 6b5f8bba15..3947bf640f 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -104,7 +104,7 @@ 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 to its default -1. +to 1 if it was -1. To make FFmpeg recognize the format automatically, this directive must appears exactly as is (no extra space or byte-order-mark) on the very first @@ -192,7 +192,9 @@ component. If set to 0, any file name is accepted. -The default is -1, it is equivalent to 1 if the format was automatically +The default is 1. + +-1 is equivalent to 1 if the format was automatically probed and 0 otherwise. @item auto_convert |