summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/command.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c
index 013e303ffe..877e0e7e5a 100644
--- a/player/command.c
+++ b/player/command.c
@@ -280,10 +280,9 @@ int mp_on_set_option(void *ctx, struct m_config_option *co, void *data, int flag
// OK, is handled separately: playlist
// OK, does not conflict on low level: audio-file, sub-file, external-file
static const char *const no_property[] = {
- "playlist-pos", // checks playlist bounds, "no" choice missing
"volume", // restricts to --volume-max
"demuxer", "idle", "length", "audio-samplerate", "audio-channels",
- "audio-format", "fps", "cache", // different semantics
+ "audio-format", "fps", "cache", "playlist-pos", // different semantics
NULL
};