summaryrefslogtreecommitdiffstats
path: root/cfg-common-opts.h
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 /cfg-common-opts.h
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 'cfg-common-opts.h')
-rw-r--r--cfg-common-opts.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h
index 7927bedf14..19a131220b 100644
--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@@ -40,6 +40,7 @@
{"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* CONFIG_DVDREAD */
+ OPT_INTRANGE("edition", edition_id, 0, -1, 8190),
{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},