Commit 3331213e authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/concatdec: Enable auto_convert by default

Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?
Reviewed-by: 's avatarNicolas George <george@nsup.org>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e1b00195
...@@ -151,6 +151,7 @@ probed and 0 otherwise. ...@@ -151,6 +151,7 @@ probed and 0 otherwise.
@item auto_convert @item auto_convert
If set to 1, try to perform automatic conversions on packet data to make the If set to 1, try to perform automatic conversions on packet data to make the
streams concatenable. streams concatenable.
The default is 1.
Currently, the only conversion is adding the h264_mp4toannexb bitstream Currently, the only conversion is adding the h264_mp4toannexb bitstream
filter to H.264 streams in MP4 format. This is necessary in particular if filter to H.264 streams in MP4 format. This is necessary in particular if
......
...@@ -627,7 +627,7 @@ static const AVOption options[] = { ...@@ -627,7 +627,7 @@ 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 = 1}, 0, 1, DEC },
{ NULL } { NULL }
}; };
......
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