ffmpeg | branch: release/2.7 | Michael Niedermayer <mich...@niedermayer.cc> |
Tue Jan 19 22:13:14 2016 +0100| [72b224e3f67a3c2f9cb8954a92e0bc3450ac3634] |
committer: 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: Nicolas George <geo...@nsup.org>
Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 689211d5727231c3fe92762d224dbadebdbf4e30)
Conflicts:
libavformat/concatdec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72b224e3f67a3c2f9cb8954a92e0bc3450ac3634
---
doc/demuxers.texi | 6 ++++--
libavformat/concatdec.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 6f9effc..45949db 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 07db9f9..0b14347 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 = 1}, 0, 1, DEC },
{ NULL }
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
