Commit a0e5c850 authored by aurel's avatar aurel

add support for S_ASS and S_SSA codec string

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9704 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 8c77510c
......@@ -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}
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment