RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-26 21:29:16 +00:00
Code Issues Releases Wiki Activity

encode: rename option --ometadata to --ocopy-metadata

Browse Source 
--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.
This commit is contained in:
TheAMM 2017-12-16 14:14:26 +02:00 committed by Kevin Mitchell
parent e2f71f509f
commit c8d955571d
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCS/interface-changes.rst
View File

@ -67,6 +67,7 @@ Interface changes
- deprecate the --ff-aid, --ff-vid, --ff-sid options and properties (there is - deprecate the --ff-aid, --ff-vid, --ff-sid options and properties (there is
no replacement, but you can manually query the track property and use the no replacement, but you can manually query the track property and use the
"ff-index" field to find the mpv track ID to imitate this behavior) "ff-index" field to find the mpv track ID to imitate this behavior)
- rename --no-ometadata to --no-ocopy-metadata
--- mpv 0.27.0 --- --- mpv 0.27.0 ---
- drop previously deprecated --field-dominance option - drop previously deprecated --field-dominance option
- drop previously deprecated "osd" command - drop previously deprecated "osd" command

2
DOCS/man/encode.rst
View File

@ -150,6 +150,6 @@ You can encode files from one format/codec to another using this facility.
and all pts are passed through as-is. Never seek backwards or use multiple and all pts are passed through as-is. Never seek backwards or use multiple
input files in this mode! input files in this mode!
``--no-ometadata`` ``--no-ocopy-metadata``
Turns off copying of metadata from input files to output files when Turns off copying of metadata from input files to output files when
encoding (which is enabled by default). encoding (which is enabled by default).

2
common/encode.h
View File

@ -49,7 +49,7 @@ struct encode_opts {
int neverdrop; int neverdrop;
int video_first; int video_first;
int audio_first; int audio_first;
int metadata; int copy_metadata;
}; };
// interface for mplayer.c // interface for mplayer.c

6
common/encode_lavc.c
View File

@ -55,12 +55,12 @@ const struct m_sub_options encode_config = {
OPT_FLAG("oneverdrop", neverdrop, M_OPT_FIXED), OPT_FLAG("oneverdrop", neverdrop, M_OPT_FIXED),
OPT_FLAG("ovfirst", video_first, M_OPT_FIXED), OPT_FLAG("ovfirst", video_first, M_OPT_FIXED),
OPT_FLAG("oafirst", audio_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} {0}
}, },
.size = sizeof(struct encode_opts), .size = sizeof(struct encode_opts),
.defaults = &(const 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, void encode_lavc_set_metadata(struct encode_lavc_context *ctx,
struct mp_tags *metadata) struct mp_tags *metadata)
{ {
if (ctx->options->metadata) if (ctx->options->copy_metadata)
ctx->metadata = metadata; ctx->metadata = metadata;
} }

1
options/options.c
View File

@ -792,6 +792,7 @@ const m_option_t mp_opts[] = {
OPT_REMOVED("fs-black-out-screens", NULL), OPT_REMOVED("fs-black-out-screens", NULL),
OPT_REPLACED("sub-paths", "sub-file-paths"), OPT_REPLACED("sub-paths", "sub-file-paths"),
OPT_REMOVED("heartbeat-cmd", "use Lua scripting instead"), OPT_REMOVED("heartbeat-cmd", "use Lua scripting instead"),
OPT_REMOVED("no-ometadata", "use --no-ocopy-metadata"),
{0} {0}
}; };