From 3dc8f63baabb9af519b125537808b8b27d82ab47 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 Dec 2014 23:23:50 +0100 Subject: options: make --no-... options work for OPT_REPLACED too Do this by automatically adding the option, if the aliased option name also has a "no-..." variant. Could be easier by manually adding "no-..." variants to the option list, but this seems better because you can't just forget it. --- options/options.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index 375414b2ff..7c52a60a2a 100644 --- a/options/options.c +++ b/options/options.c @@ -275,7 +275,6 @@ const m_option_t mp_opts[] = { OPT_STRING("vd", video_decoders, 0), OPT_FLAG("ad-spdif-dtshd", dtshd, 0), - OPT_FLAG("dtshd", dtshd, 0), // old alias OPT_CHOICE("hwdec", hwdec_api, 0, ({"no", 0}, @@ -305,7 +304,6 @@ const m_option_t mp_opts[] = { OPT_SUBSTRUCT("demuxer-rawvideo", demux_rawvideo, demux_rawvideo_conf, 0), OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0), - OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias OPT_DOUBLE("demuxer-mkv-subtitle-preroll-secs", mkv_subtitle_preroll_secs, M_OPT_MIN, .min = 0), OPT_FLAG("demuxer-mkv-probe-video-duration", mkv_probe_duration, 0), @@ -643,6 +641,9 @@ const m_option_t mp_opts[] = { OPT_REMOVED("no-cache-pause-below", "use --no-cache-pause"), OPT_REMOVED("volstep", "edit input.conf directly instead"), + OPT_REPLACED("mkv-subtitle-preroll", "demuxer-mkv-subtitle-preroll"), + OPT_REPLACED("dtshd", "ad-spdif-dtshd"), + {0} }; -- cgit v1.2.3