diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-09-19 23:37:51 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-09-21 16:06:29 +0000 |
| commit | 36ea5d7b5cafabba605aaa334017c48b27d6f5be (patch) | |
| tree | f38973892c8128d819d093f33a9fd194eb38a5d5 /common | |
| parent | 4b2276b730c8542649b665aaec187e1c7e3b2612 (diff) | |
| download | mpv-36ea5d7b5cafabba605aaa334017c48b27d6f5be.tar.bz2 mpv-36ea5d7b5cafabba605aaa334017c48b27d6f5be.tar.xz | |
options: remove a few options marked with .deprecation_message
A bit different from the OPT_REPLACED/OPT_REMOVED ones in that the
options still possibly do something but they have a deprecation
message. Most of these are old and have no real usage. The only
potentially controversial ones are the removal of --oaffset and
--ovoffset which were deprecated years ago and seemingly have no real
replacement. There's a cryptic message about --audio-delay but who
knows. The less encoding mode code we have, the better so just chuck
it.
Diffstat (limited to 'common')
| -rw-r--r-- | common/encode.h | 4 | ||||
| -rw-r--r-- | common/encode_lavc.c | 17 | ||||
| -rw-r--r-- | common/encode_lavc.h | 2 |
3 files changed, 0 insertions, 23 deletions
diff --git a/common/encode.h b/common/encode.h index 85fc3f1960..33d778cd67 100644 --- a/common/encode.h +++ b/common/encode.h @@ -38,11 +38,7 @@ struct encode_opts { char **vopts; char *acodec; char **aopts; - float voffset; - float aoffset; bool rawts; - bool video_first; - bool audio_first; bool copy_metadata; char **set_metadata; char **remove_metadata; diff --git a/common/encode_lavc.c b/common/encode_lavc.c index f52d50a7e2..47e9883e0c 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -83,15 +83,7 @@ const struct m_sub_options encode_config = { {"ovcopts", OPT_KEYVALUELIST(vopts), .flags = M_OPT_HAVE_HELP}, {"oac", OPT_STRING(acodec)}, {"oacopts", OPT_KEYVALUELIST(aopts), .flags = M_OPT_HAVE_HELP}, - {"ovoffset", OPT_FLOAT(voffset), M_RANGE(-1000000.0, 1000000.0), - .deprecation_message = "--audio-delay (once unbroken)"}, - {"oaoffset", OPT_FLOAT(aoffset), M_RANGE(-1000000.0, 1000000.0), - .deprecation_message = "--audio-delay (once unbroken)"}, {"orawts", OPT_BOOL(rawts)}, - {"ovfirst", OPT_BOOL(video_first), - .deprecation_message = "no replacement"}, - {"oafirst", OPT_BOOL(audio_first), - .deprecation_message = "no replacement"}, {"ocopy-metadata", OPT_BOOL(copy_metadata)}, {"oset-metadata", OPT_KEYVALUELIST(set_metadata)}, {"oremove-metadata", OPT_STRINGLIST(remove_metadata)}, @@ -954,13 +946,4 @@ fail: return false; } -double encoder_get_offset(struct encoder_context *p) -{ - switch (p->encoder->codec_type) { - case AVMEDIA_TYPE_VIDEO: return p->options->voffset; - case AVMEDIA_TYPE_AUDIO: return p->options->aoffset; - default: return 0; - } -} - // vim: ts=4 sw=4 et diff --git a/common/encode_lavc.h b/common/encode_lavc.h index c60afb6cc5..ae89c6b572 100644 --- a/common/encode_lavc.h +++ b/common/encode_lavc.h @@ -111,6 +111,4 @@ bool encoder_encode(struct encoder_context *p, AVFrame *frame); // Caller needs to acquire encode_lavc_context.lock (or call it from on_ready). AVRational encoder_get_mux_timebase_unlocked(struct encoder_context *p); -double encoder_get_offset(struct encoder_context *p); - #endif |