summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-13 02:05:37 +0200
committerwm4 <wm4@nowhere>2014-06-13 02:05:37 +0200
commit98a31d5937e8397d8fcd0fefe56630a1cd765cf0 (patch)
tree047059fc97815b1ddafd35f1e68717a09cfed61e /options/options.c
parenta7a14be088b6af60a506db04e5ee864112bc5544 (diff)
downloadmpv-98a31d5937e8397d8fcd0fefe56630a1cd765cf0.tar.bz2
mpv-98a31d5937e8397d8fcd0fefe56630a1cd765cf0.tar.xz
options: turn --idx, --forceidx into --index
Also clarify the semantics. It seems --idx didn't do anything. Possibly it used to change how the now removed legacy demuxers like demux_avi used to behave. Or maybe it was accidental. --forceidx basically becomes --index=force. It's possible that new index modes will be added in the future, so I'm keeping it extensible, instead of e.g. creating --force-index.
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c
index 63f4653317..dfa5106658 100644
--- a/options/options.c
+++ b/options/options.c
@@ -186,9 +186,7 @@ const m_option_t mp_opts[] = {
OPT_FLAG("pause", pause, M_OPT_FIXED),
OPT_FLAG("keep-open", keep_open, 0),
- // AVI and Ogg only: (re)build index at startup
- OPT_FLAG_CONSTANTS("idx", index_mode, 0, -1, 1),
- OPT_FLAG_STORE("forceidx", index_mode, 0, 2),
+ OPT_CHOICE("index", index_mode, 0, ({"default", 1}, {"recreate", 0})),
// select audio/video/subtitle stream
OPT_TRACKCHOICE("aid", audio_id),
@@ -628,7 +626,7 @@ const struct MPOpts mp_default_opts = {
.hwdec_codecs = "h264,vc1,wmv3",
- .index_mode = -1,
+ .index_mode = 1,
.dvd_angle = 1,