summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/encode.h2
-rw-r--r--common/encode_lavc.c6
2 files changed, 4 insertions, 4 deletions
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;
}