From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 15 Jul 2015 21:32:10 +0000 (+0200)
Subject: MKV: support WebVTT subtitles embedded
X-Git-Tag: archive/raspbian/2.2.6-6+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7a44147b37d58ac1a8f3adbffc8cbd1b0840572e;p=vlc.git

MKV: support WebVTT subtitles embedded


Gbp-Pq: Name 0010-MKV-support-WebVTT-subtitles-embedded.patch
---

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index e8a68522..26202063 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1837,6 +1837,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
     {
         p_tk->fmt.i_codec = VLC_CODEC_BD_PG;
     }
+    else if( !strcmp( p_tk->psz_codec, "D_WEBVTT/SUBTITLES" ) )
+    {
+        p_tk->fmt.i_codec = VLC_CODEC_SUBT;
+        p_tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
+    }
     else if( !strcmp( p_tk->psz_codec, "B_VOBBTN" ) )
     {
         p_tk->fmt.i_cat = NAV_ES;