diff options
author | wm4 <wm4@nowhere> | 2013-08-21 18:24:56 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-08-21 18:32:42 +0200 |
commit | c8a7140c739038d33e030aa0b668e101e5228491 (patch) | |
tree | f052038fd92ea9d7b0af555e189aef2b383372a9 | |
parent | 92658864ae374e6d96cd000e4b04c7c78a2e6109 (diff) | |
download | mpv-c8a7140c739038d33e030aa0b668e101e5228491.tar.bz2 mpv-c8a7140c739038d33e030aa0b668e101e5228491.tar.xz |
mplayer: start track IDs from 1 rather than 0
Completely pointless, but makes ChrisK happy for some reason.
Track ID 0 is now rejected by the option parser itself.
-rw-r--r-- | DOCS/man/en/options.rst | 2 | ||||
-rw-r--r-- | mpvcore/m_option.h | 2 | ||||
-rw-r--r-- | mpvcore/mplayer.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 4174e1f0d6..9549f335c5 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1870,7 +1870,7 @@ Play files in random order. ``--sid=<ID|auto|no>`` - Display the subtitle stream specified by ``<ID>`` (0-31). ``auto`` selects + Display the subtitle stream specified by ``<ID>``. ``auto`` selects the default, ``no`` disables subtitles. See also ``--slang``, ``--no-sub``. diff --git a/mpvcore/m_option.h b/mpvcore/m_option.h index 03daa87cd4..96219b317a 100644 --- a/mpvcore/m_option.h +++ b/mpvcore/m_option.h @@ -624,7 +624,7 @@ int m_option_required_params(const m_option_t *opt); OPT_GENERAL(struct m_geometry, __VA_ARGS__, .type = &m_option_type_size_box) #define OPT_TRACKCHOICE(name, var) \ - OPT_CHOICE_OR_INT(name, var, 0, 0, 8190, ({"no", -2}, {"auto", -1})) + OPT_CHOICE_OR_INT(name, var, 0, 1, 8190, ({"no", -2}, {"auto", -1})) #define OPT_STRING_VALIDATE_(optname, varname, flags, validate_fn, ...) \ OPT_GENERAL(char*, optname, varname, flags, __VA_ARGS__, \ diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index fe1d18740b..001798aa9b 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -929,7 +929,7 @@ static bool demux_was_interrupted(struct MPContext *mpctx) static int find_new_tid(struct MPContext *mpctx, enum stream_type t) { - int new_id = -1; + int new_id = 0; for (int i = 0; i < mpctx->num_tracks; i++) { struct track *track = mpctx->tracks[i]; if (track->type == t) |