From ee8c87b55bcd53f273e1abd890dccd97e378d3fb Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 16 Jul 2007 14:51:43 +0000 Subject: add support for S_ASS and S_SSA codec string Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroska.c | 2 ++ libavformat/matroskadec.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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} 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; } -- cgit v1.2.3