summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-24 17:46:14 +0100
committerwm4 <wm4@nowhere>2013-12-24 17:46:14 +0100
commit3720b3f17d4951ab839418b5cbfd1a85eb74adba (patch)
tree819b311b4c224ba2fd3dcd0efe8008a83f2cc938 /options
parent9292f537d661af16321fd35eb0016e830594863b (diff)
downloadmpv-3720b3f17d4951ab839418b5cbfd1a85eb74adba.tar.bz2
mpv-3720b3f17d4951ab839418b5cbfd1a85eb74adba.tar.xz
player: add --secondary-sid for displaying a second subtitle stream
This is relatively hacky, but it's Christmas, so it's ok. This does two things: 1. allow selecting two subtitle tracks, and 2. include a hack that renders the second subtitle always as toptitle. See manpage additions how to use this.
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index ea1de3e3f6..5693a34cd0 100644
--- a/options/options.c
+++ b/options/options.c
@@ -301,6 +301,7 @@ const m_option_t mp_opts[] = {
OPT_TRACKCHOICE("aid", audio_id),
OPT_TRACKCHOICE("vid", video_id),
OPT_TRACKCHOICE("sid", sub_id),
+ OPT_TRACKCHOICE("secondary-sid", sub2_id),
OPT_FLAG_STORE("no-sub", sub_id, 0, -2),
OPT_FLAG_STORE("no-video", video_id, 0, -2),
OPT_FLAG_STORE("no-audio", audio_id, 0, -2),
diff --git a/options/options.h b/options/options.h
index 1d997d363b..4889201b93 100644
--- a/options/options.h
+++ b/options/options.h
@@ -147,6 +147,7 @@ typedef struct MPOpts {
int audio_id;
int video_id;
int sub_id;
+ int sub2_id;
char **audio_lang;
char **sub_lang;
int audio_display;