summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-05 02:39:12 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:07:30 +0200
commitb94cdc4bafddc50ec5e1a38f9a9b85d069a21817 (patch)
tree0e92a42cea765f1b68b657ffbf3c7bf381aafe3c /cfg-mplayer.h
parentc955549204c433abd1a3c8783f1b988e29315337 (diff)
downloadmpv-b94cdc4bafddc50ec5e1a38f9a9b85d069a21817.tar.bz2
mpv-b94cdc4bafddc50ec5e1a38f9a9b85d069a21817.tar.xz
options: change --vid, --aid, --sid options
The --vid, --aid, --sid options now accept the values 'off' and 'auto', instead of having the user deal with the numeric values -2 and -1. The numeric values are not allowed anymore. Remove the --audio option. It was probably meant as compensation option for --no-audio. There are no such options for sub/video, and it was not documented, so just remove it. The replacement is "--aid=auto". Also do some updates to the manpage.
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index e433e91955..fa5f35af6c 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -397,12 +397,11 @@ const m_option_t common_opts[] = {
{"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL},
// select audio/video/subtitle stream
- OPT_INTRANGE("aid", audio_id, 0, -2, 8190),
- OPT_INTRANGE("vid", video_id, 0, -2, 8190),
- OPT_INTRANGE("sid", sub_id, 0, -2, 8190),
+ OPT_TRACKCHOICE("aid", audio_id),
+ OPT_TRACKCHOICE("vid", video_id),
+ OPT_TRACKCHOICE("sid", sub_id),
OPT_FLAG_CONSTANTS("no-sub", sub_id, 0, -1, -2),
OPT_FLAG_CONSTANTS("no-video", video_id, 0, -1, -2),
- OPT_FLAG_CONSTANTS("audio", audio_id, 0, -2, -1),
OPT_FLAG_CONSTANTS("no-audio", audio_id, 0, -1, -2),
OPT_STRINGLIST("alang", audio_lang, 0),
OPT_STRINGLIST("slang", sub_lang, 0),