From c8d955571dbf15d7aa0280c439c964907ded32f4 Mon Sep 17 00:00:00 2001 From: TheAMM Date: Sat, 16 Dec 2017 14:14:26 +0200 Subject: 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. --- common/encode.h | 2 +- common/encode_lavc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/encode.h b/common/encode.h index e0e39e91cb..ce5d06873d 100644 --- a/common/encode.h +++ b/common/encode.h @@ -49,7 +49,7 @@ struct encode_opts { int neverdrop; int video_first; int audio_first; - int metadata; + int copy_metadata; }; // interface for mplayer.c 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; } -- cgit v1.2.3