summaryrefslogtreecommitdiffstats
path: root/common/encode_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-04-29 02:55:27 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-03 01:08:44 +0300
commitf18c4175ad8e772c0005ac6280291af425c16cc2 (patch)
tree46aac8acb7cedd83de8958d86bbd69d179a6cc9f /common/encode_lavc.c
parent60dade104033f04fdd64f400d3f6707cf16d0ed7 (diff)
downloadmpv-f18c4175ad8e772c0005ac6280291af425c16cc2.tar.bz2
mpv-f18c4175ad8e772c0005ac6280291af425c16cc2.tar.xz
encode: remove old timestamp handling
This effectively makes --ocopyts the default. The --ocopyts option itself is also removed, because it's redundant.
Diffstat (limited to 'common/encode_lavc.c')
-rw-r--r--common/encode_lavc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/common/encode_lavc.c b/common/encode_lavc.c
index 5d34af609b..2473609921 100644
--- a/common/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -81,21 +81,15 @@ const struct m_sub_options encode_config = {
OPT_STRING("o", file, M_OPT_FIXED | CONF_NOCFG | CONF_PRE_PARSE | M_OPT_FILE),
OPT_STRING("of", format, M_OPT_FIXED),
OPT_KEYVALUELIST("ofopts", fopts, M_OPT_FIXED | M_OPT_HAVE_HELP),
- OPT_FLOATRANGE("ofps", fps, M_OPT_FIXED, 0.0, 1000000.0),
- OPT_FLOATRANGE("omaxfps", maxfps, M_OPT_FIXED, 0.0, 1000000.0),
OPT_STRING("ovc", vcodec, M_OPT_FIXED),
OPT_KEYVALUELIST("ovcopts", vopts, M_OPT_FIXED | M_OPT_HAVE_HELP),
OPT_STRING("oac", acodec, M_OPT_FIXED),
OPT_KEYVALUELIST("oacopts", aopts, M_OPT_FIXED | M_OPT_HAVE_HELP),
- OPT_FLAG("oharddup", harddup, M_OPT_FIXED),
OPT_FLOATRANGE("ovoffset", voffset, M_OPT_FIXED, -1000000.0, 1000000.0,
.deprecation_message = "--audio-delay (once unbroken)"),
OPT_FLOATRANGE("oaoffset", aoffset, M_OPT_FIXED, -1000000.0, 1000000.0,
.deprecation_message = "--audio-delay (once unbroken)"),
- OPT_FLAG("ocopyts", copyts, M_OPT_FIXED),
OPT_FLAG("orawts", rawts, M_OPT_FIXED),
- OPT_FLAG("oautofps", autofps, M_OPT_FIXED),
- OPT_FLAG("oneverdrop", neverdrop, M_OPT_FIXED),
OPT_FLAG("ovfirst", video_first, M_OPT_FIXED,
.deprecation_message = "no replacement"),
OPT_FLAG("oafirst", audio_first, M_OPT_FIXED,
@@ -103,6 +97,13 @@ const struct m_sub_options encode_config = {
OPT_FLAG("ocopy-metadata", copy_metadata, M_OPT_FIXED),
OPT_KEYVALUELIST("oset-metadata", set_metadata, M_OPT_FIXED),
OPT_STRINGLIST("oremove-metadata", remove_metadata, M_OPT_FIXED),
+
+ OPT_REMOVED("ocopyts", "ocopyts is now the default"),
+ OPT_REMOVED("oneverdrop", "no replacement"),
+ OPT_REMOVED("oharddup", "use --vf-add=fps=VALUE"),
+ OPT_REMOVED("ofps", "no replacement (use --vf-add=fps=VALUE for CFR)"),
+ OPT_REMOVED("oautofps", "no replacement"),
+ OPT_REMOVED("omaxfps", "no replacement"),
{0}
},
.size = sizeof(struct encode_opts),