diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-19 22:13:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-29 14:23:41 +0200 |
| commit | b653f7999ad3137c890d97c0f761cedd92ec31ef (patch) | |
| tree | e6369f50df080828c05794ba113ad41882401eb8 | |
| parent | d33cc39eb8d989a3add397f3b8490c827831db83 (diff) | |
| download | ffmpeg-b653f7999ad3137c890d97c0f761cedd92ec31ef.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>
(cherry picked from commit 689211d5727231c3fe92762d224dbadebdbf4e30)
Conflicts:
libavformat/concatdec.c
| -rw-r--r-- | doc/demuxers.texi | 6 | ||||
| -rw-r--r-- | libavformat/concatdec.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 3a1d899cfb..fa5af02d5a 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -98,7 +98,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 @@ -145,7 +145,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 diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index f07cfd7e8f..5b8c76f738 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -625,7 +625,7 @@ static int concat_seek(AVFormatContext *avf, int stream, static const AVOption options[] = { { "safe", "enable safe mode", - OFFSET(safe), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, DEC }, + OFFSET(safe), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, DEC }, { "auto_convert", "automatically convert bitstream format", OFFSET(auto_convert), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC }, { NULL } |