diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-16 14:51:43 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-16 14:51:43 +0000 |
| commit | ee8c87b55bcd53f273e1abd890dccd97e378d3fb (patch) | |
| tree | 7275bcf0178c040f5ad5cc8590db73caaf77ca8c /libavformat | |
| parent | f999b63c77bd39ee0b56f14ceced478108976db1 (diff) | |
| download | ffmpeg-ee8c87b55bcd53f273e1abd890dccd97e378d3fb.tar.gz | |
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')
| -rw-r--r-- | libavformat/matroska.c | 2 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
2 files changed, 5 insertions, 1 deletions
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; } |