summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-28 14:56:52 +0200
committerwm4 <wm4@nowhere>2013-06-28 14:57:19 +0200
commiteb2b307788786e734b27fba8ff2630dd70f03d72 (patch)
treec4708b3ca6a0da7ab28bf84b45e832c1894decb1 /core
parent0435ab7131f1bb525a27263b355d341b6d4cf775 (diff)
downloadmpv-eb2b307788786e734b27fba8ff2630dd70f03d72.tar.bz2
mpv-eb2b307788786e734b27fba8ff2630dd70f03d72.tar.xz
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.
Diffstat (limited to 'core')
-rw-r--r--core/options.c7
1 files changed, 4 insertions, 3 deletions
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),