summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.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/matroskadec.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/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b7d8cd6497..532ccd8c83 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2147,7 +2147,9 @@ matroska_read_header (AVFormatContext *s,
else if (codec_id == CODEC_ID_TEXT) {
MatroskaSubtitleTrack *subtrack=(MatroskaSubtitleTrack *)track;
if (!strcmp(track->codec_id, "S_TEXT/ASS") ||
- !strcmp(track->codec_id, "S_TEXT/SSA"))
+ !strcmp(track->codec_id, "S_TEXT/SSA") ||
+ !strcmp(track->codec_id, "S_ASS") ||
+ !strcmp(track->codec_id, "S_SSA"))
subtrack->ass = 1;
}