summaryrefslogtreecommitdiffstats
path: root/defaultopts.c
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 /defaultopts.c
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 'defaultopts.c')
-rw-r--r--defaultopts.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/defaultopts.c b/defaultopts.c
index 2bd6f7e3e3..b5917c53a7 100644
--- a/defaultopts.c
+++ b/defaultopts.c
@@ -21,6 +21,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
.osd_duration = 1000,
.loop_times = -1,
.ordered_chapters = 1,
+ .edition_id = -1,
.user_correct_pts = -1,
.key_fifo_size = 7,
.doubleclick_time = 300,