summaryrefslogtreecommitdiffstats
path: root/common/encode_lavc.c
diff options
context:
space:
mode:
authorTheAMM <the.actual.amm@gmail.com>2017-12-16 14:14:26 +0200
committerKevin Mitchell <kevmitch@gmail.com>2017-12-26 03:33:19 -0700
commitc8d955571dbf15d7aa0280c439c964907ded32f4 (patch)
tree13ec44eb9449b3d73ba2585c3effda06f801705b /common/encode_lavc.c
parente2f71f509fde010e4d0f175014fd4219b7dc7681 (diff)
downloadmpv-c8d955571dbf15d7aa0280c439c964907ded32f4.tar.bz2
mpv-c8d955571dbf15d7aa0280c439c964907ded32f4.tar.xz
encode: rename option --ometadata to --ocopy-metadata
--copy-metadata describes the result of the option better, (copying metadata from the source file to the output file). Marks the old --no-ometadata OPT_REMOVED with a suggestion for the new --no-ocopy-metadata.
Diffstat (limited to 'common/encode_lavc.c')
-rw-r--r--common/encode_lavc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/encode_lavc.c b/common/encode_lavc.c
index 2d32c56cfc..9c994bfdce 100644
--- a/common/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -55,12 +55,12 @@ const struct m_sub_options encode_config = {
OPT_FLAG("oneverdrop", neverdrop, M_OPT_FIXED),
OPT_FLAG("ovfirst", video_first, M_OPT_FIXED),
OPT_FLAG("oafirst", audio_first, M_OPT_FIXED),
- OPT_FLAG("ometadata", metadata, M_OPT_FIXED),
+ OPT_FLAG("ocopy-metadata", copy_metadata, M_OPT_FIXED),
{0}
},
.size = sizeof(struct encode_opts),
.defaults = &(const struct encode_opts){
- .metadata = 1,
+ .copy_metadata = 1,
},
};
@@ -278,7 +278,7 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options,
void encode_lavc_set_metadata(struct encode_lavc_context *ctx,
struct mp_tags *metadata)
{
- if (ctx->options->metadata)
+ if (ctx->options->copy_metadata)
ctx->metadata = metadata;
}