summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en
diff options
context:
space:
mode:
authorDaniel Dawson <ddawson@icehouse.net>2009-12-01 04:28:34 -0800
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-04 19:43:17 +0200
commitc3c0309eecc1d6b309138fcd40df508235c9395d (patch)
tree5d6dbd76ff7085f0f95bfddf32e31f8ef4ee49bd /DOCS/man/en
parent9b81b7827ce4ce887c6f22332e31b058f68cf3ac (diff)
downloadmpv-c3c0309eecc1d6b309138fcd40df508235c9395d.tar.bz2
mpv-c3c0309eecc1d6b309138fcd40df508235c9395d.tar.xz
Support for multiple editions in Matroska
Add code to intelligently choose an appropriate Matroska edition when there are several. Will choose, in descending order of preference: the edition chosen by the user through the option "-edition <edition id>" if it exists, the first edition with EditionFlagDefault set to 1 if there is one, or the first edition.
Diffstat (limited to 'DOCS/man/en')
-rw-r--r--DOCS/man/en/mplayer.16
1 files changed, 6 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 5a23c4d74c..0393c47dda 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1301,6 +1301,12 @@ Specify which chapter to start playing at.
Optionally specify which chapter to end playing at (default: 1).
.
.TP
+.B \-edition <edition ID> (Matroska, MPlayer only)
+Specify the edition (set of chapters) to use, where 0 is the first. If set to
+-1 (the default), MPlayer will choose the first edition declared as a default,
+or if there is no default, the first edition defined.
+.
+.TP
.B \-cookies (network only)
Send cookies when making HTTP requests.
.