From f18c4175ad8e772c0005ac6280291af425c16cc2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 29 Apr 2018 02:55:27 +0200 Subject: encode: remove old timestamp handling This effectively makes --ocopyts the default. The --ocopyts option itself is also removed, because it's redundant. --- common/encode_lavc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'common/encode_lavc.c') 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), -- cgit v1.2.3