summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-06-14 16:43:07 +0200
committerwm4 <wm4@nowhere>2016-06-14 16:43:07 +0200
commita30e7272669478ca1a04469c0ab3614b0e99dd98 (patch)
tree1be3c825290198bc535f2ee768ad630e5cd3ee4e /demux
parent788929e4e07e00325cc1b2f58569db9de1ba47fb (diff)
downloadmpv-a30e7272669478ca1a04469c0ab3614b0e99dd98.tar.bz2
mpv-a30e7272669478ca1a04469c0ab3614b0e99dd98.tar.xz
demux_mkv: support Matroska webvtt
They're different from the Google/WebM subtitle types, and use a new codec ID. Fixes #3247.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index a77b2501b3..f454f5fd20 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1720,6 +1720,7 @@ static const char *const mkv_sub_tag[][2] = {
{ "S_HDMV/PGS", "hdmv_pgs_subtitle"},
{ "D_WEBVTT/SUBTITLES", "webvtt-webm"},
{ "D_WEBVTT/CAPTIONS", "webvtt-webm"},
+ { "S_TEXT/WEBVTT", "webvtt"},
{ "S_DVBSUB", "dvb_subtitle"},
{0}
};