summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-28 15:26:30 +0200
committerwm4 <wm4@nowhere>2013-06-28 15:26:30 +0200
commitf296258de0bb43363f45941b3d01b3cf63a8c1bd (patch)
treec2b96fb98edf2fce0f01871abdbdb76fe93fb8c9 /core
parent07131a9523eea9aef16f63b371cfefa5e9a286cf (diff)
downloadmpv-f296258de0bb43363f45941b3d01b3cf63a8c1bd.tar.bz2
mpv-f296258de0bb43363f45941b3d01b3cf63a8c1bd.tar.xz
options: rename --mkv-subtitle-preroll, --dtshd
We still keep the old names as alias for short-time compatibility.
Diffstat (limited to 'core')
-rw-r--r--core/options.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/options.c b/core/options.c
index 8f129952fe..a12d041420 100644
--- a/core/options.c
+++ b/core/options.c
@@ -407,7 +407,6 @@ const m_option_t mp_opts[] = {
OPT_STRING("audio-demuxer", audio_demuxer_name, 0),
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
OPT_FLAG("extbased", extension_parsing, 0),
- OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
{"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
#ifdef CONFIG_RADIO
@@ -452,7 +451,9 @@ const m_option_t mp_opts[] = {
OPT_STRING("ad", audio_decoders, 0),
OPT_STRING("vd", video_decoders, 0),
- OPT_FLAG("dtshd", dtshd, 0),
+
+ OPT_FLAG("ad-spdif-dtshd", dtshd, 0),
+ OPT_FLAG("dtshd", dtshd, 0), // old alias
OPT_CHOICE("hwdec", hwdec_api, 0,
({"no", 0},
@@ -485,6 +486,9 @@ const m_option_t mp_opts[] = {
{"demuxer-rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG},
{"demuxer-rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG},
+ OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
+ OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias
+
// ------------------------- subtitles options --------------------
OPT_STRINGLIST("sub", sub_name, 0),