Commit 689211d5 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarNicolas George <george@nsup.org>
Reviewed-previously-by: 's avatarAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent caeed047
...@@ -104,7 +104,7 @@ All subsequent file-related directives apply to that file. ...@@ -104,7 +104,7 @@ All subsequent file-related directives apply to that file.
@item @code{ffconcat version 1.0} @item @code{ffconcat version 1.0}
Identify the script type and version. It also sets the @option{safe} option 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 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 appears exactly as is (no extra space or byte-order-mark) on the very first
...@@ -192,7 +192,9 @@ component. ...@@ -192,7 +192,9 @@ component.
If set to 0, any file name is accepted. 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. probed and 0 otherwise.
@item auto_convert @item auto_convert
......
...@@ -710,7 +710,7 @@ static int concat_seek(AVFormatContext *avf, int stream, ...@@ -710,7 +710,7 @@ static int concat_seek(AVFormatContext *avf, int stream,
static const AVOption options[] = { static const AVOption options[] = {
{ "safe", "enable safe mode", { "safe", "enable safe mode",
OFFSET(safe), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, DEC }, OFFSET(safe), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, DEC },
{ "auto_convert", "automatically convert bitstream format", { "auto_convert", "automatically convert bitstream format",
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC }, OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata", { "segment_time_metadata", "output file segment start time and duration as packet metadata",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment