RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 689211d572)

Conflicts:

	libavformat/concatdec.c
This commit is contained in:
Michael Niedermayer 2016-01-19 22:13:14 +01:00
parent 79d9680c7b
commit 0edcb9e710
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/demuxers.texi
View File

@ -78,7 +78,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
@ -125,7 +125,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

2
libavformat/concatdec.c
View File

@ -604,7 +604,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_INT, {.i64 = -1}, -1, 1, DEC }, OFFSET(safe), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, DEC },
{ "auto_convert", "automatically convert bitstream format", { "auto_convert", "automatically convert bitstream format",
OFFSET(auto_convert), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC }, OFFSET(auto_convert), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC },
{ NULL } { NULL }