diff options
| author | Mark Reid <mindmark@gmail.com> | 2019-03-11 13:22:37 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-13 12:39:51 +0100 |
| commit | 283ce69a107b2d6ec2bae28574d155694a027ff1 (patch) | |
| tree | 5ae11bf4aa8cc01585d3ca2dd9a9448159ec274b | |
| parent | f6803cfbd2d725770dcd1d3a15eda7028a9c2533 (diff) | |
| download | ffmpeg-streaming-283ce69a107b2d6ec2bae28574d155694a027ff1.zip ffmpeg-streaming-283ce69a107b2d6ec2bae28574d155694a027ff1.tar.gz | |
avformat/mxfenc: allow user comments for opatom muxer
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | doc/muxers.texi | 4 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 372fab2..aac7d94 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 032ee3b..8c6db94 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 }, }; |
