summaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-07-11 13:13:20 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-07-11 13:13:20 +0000
commitf7e97aaf877fbed5b618798c055603e5d7da5d12 (patch)
tree992be041fc63049143b60c7fa3349f27c9a7782b /libavformat/matroska.c
parent45da8124a09d0ac5f9d8174884584c5f80309d0c (diff)
add support for Matroska subtitle tracks
Originally committed as revision 9591 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index d593dea50e..df8d9513ba 100644
--- 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 */
};