From 979c0910567e6019d109c6449862bf5863336262 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 11 Jul 2007 13:37:07 +0000
Subject: add support for ASS like subtitles in Matroska

Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/matroska.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavformat/matroska.c')

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index df8d9513ba..bac262841f 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -61,6 +61,8 @@ CodecTags ff_mkv_codec_tags[]={
 
     {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
+    {"S_TEXT/ASS"       , CODEC_ID_TEXT},
+    {"S_TEXT/SSA"       , CODEC_ID_TEXT},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
     {NULL               , CODEC_ID_NONE}
-- 
cgit v1.2.3