Skip to content

Commit

Permalink
avformat/mxfenc: allow user comments for opatom muxer
Browse files Browse the repository at this point in the history
Reviewed-by: Tomas Härdin <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
  • Loading branch information
markreidvfx authored and michaelni committed Mar 13, 2019
1 parent f6803cf commit 283ce69
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/muxers.texi
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions libavformat/mxfenc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
};

Expand Down

0 comments on commit 283ce69

Please sign in to comment.