diff options
| -rw-r--r-- | doc/demuxers.texi | 1 | ||||
| -rw-r--r-- | libavformat/concatdec.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index b7ddebb9a9..35a1561439 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -151,6 +151,7 @@ probed and 0 otherwise. @item auto_convert If set to 1, try to perform automatic conversions on packet data to make the streams concatenable. +The default is 1. Currently, the only conversion is adding the h264_mp4toannexb bitstream filter to H.264 streams in MP4 format. This is necessary in particular if diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index f07cfd7e8f..07db9f96a3 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -627,7 +627,7 @@ static const AVOption options[] = { { "safe", "enable safe mode", 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 }, + OFFSET(auto_convert), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, DEC }, { NULL } }; |