summaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-07-16 14:51:43 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-07-16 14:51:43 +0000
commitee8c87b55bcd53f273e1abd890dccd97e378d3fb (patch)
tree7275bcf0178c040f5ad5cc8590db73caaf77ca8c /libavformat/matroska.c
parentf999b63c77bd39ee0b56f14ceced478108976db1 (diff)
add support for S_ASS and S_SSA codec string
Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index bac262841f..801e8fedb6 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -63,6 +63,8 @@ CodecTags ff_mkv_codec_tags[]={
{"S_TEXT/UTF8" , CODEC_ID_TEXT},
{"S_TEXT/ASS" , CODEC_ID_TEXT},
{"S_TEXT/SSA" , CODEC_ID_TEXT},
+ {"S_ASS" , CODEC_ID_TEXT},
+ {"S_SSA" , CODEC_ID_TEXT},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
{NULL , CODEC_ID_NONE}