summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-18 13:38:45 +0200
committerwm4 <wm4@nowhere>2016-09-18 16:08:21 +0200
commit9e972ed7d28c33bf612452682f229fa14ef017ea (patch)
tree747742a503bf7d866a3f99efb9821b34c552c627 /options
parent62d4a3891a152253a91f2054dd7b24c1aa5d285f (diff)
downloadmpv-9e972ed7d28c33bf612452682f229fa14ef017ea.tar.bz2
mpv-9e972ed7d28c33bf612452682f229fa14ef017ea.tar.xz
options: rename/deprecate --playlist-pos
Conflicts with the "playlist-pos" property. They're really a bit too different, and since the --playlist-pos option is relatively new and obscure, just rename it to get this out of the way.
Diffstat (limited to 'options')
-rw-r--r--options/options.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c
index 29fd14e7f5..2ae0f6ad3b 100644
--- a/options/options.c
+++ b/options/options.c
@@ -317,7 +317,8 @@ const m_option_t mp_opts[] = {
OPT_TIME("ab-loop-a", ab_loop[0], 0, .min = MP_NOPTS_VALUE),
OPT_TIME("ab-loop-b", ab_loop[1], 0, .min = MP_NOPTS_VALUE),
- OPT_CHOICE_OR_INT("playlist-pos", playlist_pos, 0, 0, INT_MAX, ({"no", -1})),
+ OPT_CHOICE_OR_INT("playlist-start", playlist_pos, 0, 0, INT_MAX,
+ ({"auto", -1}, {"no", -1})),
OPT_FLAG("pause", pause, M_OPT_FIXED),
OPT_CHOICE("keep-open", keep_open, 0,
@@ -754,6 +755,7 @@ const m_option_t mp_opts[] = {
OPT_REPLACED("input-unix-socket", "input-ipc-server"),
OPT_REPLACED("softvol-max", "volume-max"),
OPT_REMOVED("bluray-angle", "this didn't do anything for a few releases"),
+ OPT_REPLACED("playlist-pos", "playlist-start"),
{0}
};