From eb2b307788786e734b27fba8ff2630dd70f03d72 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 28 Jun 2013 14:56:52 +0200 Subject: options: rename -lavdopts to -vd-lavc, -lavfdopts to -demuxer-lavf Also change manpage so that top-level options are documented instead of suboptions. Suboptions still work, but might go away eventually. --- core/options.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/options.c b/core/options.c index 40c8527394..3d99f9979a 100644 --- a/core/options.c +++ b/core/options.c @@ -481,10 +481,11 @@ const m_option_t mp_opts[] = { OPT_CHOICE("field-dominance", field_dominance, 0, ({"auto", -1}, {"top", 0}, {"bottom", 1})), - {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - + {"vd-lavc", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG}, {"ad-lavc", (void *) ad_lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG}, + + {"demuxer-lavf", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG}, + // ------------------------- subtitles options -------------------- OPT_STRINGLIST("sub", sub_name, 0), -- cgit v1.2.3