Browse Source

add support for S_ASS and S_SSA codec string

Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Aurelien Jacobs 18 years ago
parent
commit
ee8c87b55b
2 changed files with 5 additions and 1 deletions
  1. +2
    -0
      libavformat/matroska.c
  2. +3
    -1
      libavformat/matroskadec.c

+ 2
- 0
libavformat/matroska.c View File

@@ -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}


+ 3
- 1
libavformat/matroskadec.c View File

@@ -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;
}



Loading…
Cancel
Save