diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-19 22:13:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-27 04:40:11 +0200 |
| commit | d10f4744ff0318cbb96378e15c39a354627d3119 (patch) | |
| tree | 29ed69392e18be4aa7e6df7f2a6e7704bf339af2 /libavformat | |
| parent | bf76124c51fb9236e3744290cdcef86d95361046 (diff) | |
| download | ffmpeg-d10f4744ff0318cbb96378e15c39a354627d3119.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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index be5cece8b7..b7145ef7e2 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -701,7 +701,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 } |