ffmpeg | branch: master | Mark Reid <[email protected]> | Mon Mar 11 13:22:37 2019 -0700| [283ce69a107b2d6ec2bae28574d155694a027ff1] | committer: Michael Niedermayer
avformat/mxfenc: allow user comments for opatom muxer Reviewed-by: Tomas Härdin <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=283ce69a107b2d6ec2bae28574d155694a027ff1 --- doc/muxers.texi | 4 ++-- libavformat/mxfenc.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 372fab2f92..aac7d94edf 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1629,7 +1629,7 @@ ffmpeg -i file.mpg -c copy \ out.ts @end example -@section mxf, mxf_d10 +@section mxf, mxf_d10, mxf_opatom MXF muxer. @@ -1641,7 +1641,7 @@ The muxer options are: @item store_user_comments @var{bool} Set if user comments should be stored if available or never. IRT D-10 does not allow user comments. The default is thus to write them for -mxf but not for mxf_d10 +mxf and mxf_opatom but not for mxf_d10 @end table @section null diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 032ee3bf3d..8c6db94865 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3095,6 +3095,8 @@ static const AVOption opatom_options[] = { { "mxf_audio_edit_rate", "Audio edit rate for timecode", offsetof(MXFContext, audio_edit_rate), AV_OPT_TYPE_RATIONAL, {.dbl=25}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, MXF_COMMON_OPTIONS + { "store_user_comments", "", + offsetof(MXFContext, store_user_comments), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, }; _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
