summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-17 22:44:27 +0200
committerwm4 <wm4@nowhere>2014-06-17 22:44:27 +0200
commit8ffef4be92fe52b6d70c0f76e92f062a4e6eeeca (patch)
tree1f5cd15601b814c540f4ec9f7b795786fb493b1b
parentf76b3f8d19efa9377b6c4c807138487dabc84312 (diff)
downloadmpv-8ffef4be92fe52b6d70c0f76e92f062a4e6eeeca.tar.bz2
mpv-8ffef4be92fe52b6d70c0f76e92f062a4e6eeeca.tar.xz
demux_mkv: add S_DVBSUB
Probably works; untested.
-rw-r--r--demux/demux_mkv.c1
-rw-r--r--demux/matroska.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 7b712e07ab..2c94eb6e33 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1617,6 +1617,7 @@ static const char *const mkv_sub_tag[][2] = {
{ MKV_S_PGS, "hdmv_pgs_subtitle"},
{ MKV_S_WEBVTT_S, "webvtt-webm"},
{ MKV_S_WEBVTT_C, "webvtt-webm"},
+ { MKV_S_DVB, "dvb_subtitle"},
{0}
};
diff --git a/demux/matroska.h b/demux/matroska.h
index a6be019b2d..63ef7708ab 100644
--- a/demux/matroska.h
+++ b/demux/matroska.h
@@ -94,5 +94,6 @@
#define MKV_S_ASS "S_ASS" // Deprecated
#define MKV_S_WEBVTT_S "D_WEBVTT/SUBTITLES"
#define MKV_S_WEBVTT_C "D_WEBVTT/CAPTIONS"
+#define MKV_S_DVB "S_DVBSUB"
#endif /* MPLAYER_MATROSKA_H */