From 74e3a29606f2995c5ba04944db3a32aaf2a75b55 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 21 Aug 2013 18:41:59 +0200 Subject: options: replace --edition=-1 with --edition=auto Originally, the objective of this commit was changing --edition to be 1-based, but this was cancelled. I'm still leaving the change to demux_mkv.c though, which is now only of cosmetic nature. --- mpvcore/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mpvcore') diff --git a/mpvcore/options.c b/mpvcore/options.c index 5aff219c14..eeda836914 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -370,7 +370,8 @@ const m_option_t mp_opts[] = { {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, #endif /* CONFIG_DVDREAD */ OPT_INTPAIR("chapter", chapterrange, 0), - OPT_INTRANGE("edition", edition_id, 0, -1, 8190), + OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190, + ({"auto", -1})), #ifdef CONFIG_LIBBLURAY {"bluray-device", &bluray_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"bluray-angle", &bluray_angle, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, -- cgit v1.2.3