add support for Matroska subtitle tracks

[ffmpeg.git] / libavformat / matroska.c

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index d593dea50e226e14659d6fa2f4888fbfd89807ff..df8d9513ba611a55bcb79ec5368e721b248cd76b 100644 (file)
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -58,6 +58,11 @@ CodecTags ff_mkv_codec_tags[]={
     {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
     {"A_REAL/COOK"      , CODEC_ID_COOK},
 //    {"A_REAL/SIPR"      , CODEC_ID_SIPRO},
+
+    {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
+    {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
+    {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
+
     {NULL               , CODEC_ID_NONE}
 /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
 };