diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-11 13:37:07 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-11 13:37:07 +0000 |
| commit | 979c0910567e6019d109c6449862bf5863336262 (patch) | |
| tree | b9dcb01cc23c8b4fdfe3f4b3dadfb99508f45ef3 /libavformat/matroska.c | |
| parent | 66fc495a10e810aa9d4a69aa273705142c9d7bcc (diff) | |
| download | ffmpeg-979c0910567e6019d109c6449862bf5863336262.tar.gz | |
add support for ASS like subtitles in Matroska
Originally committed as revision 9593 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index df8d9513ba..bac262841f 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -61,6 +61,8 @@ CodecTags ff_mkv_codec_tags[]={ {"S_TEXT/ASCII" , CODEC_ID_TEXT}, {"S_TEXT/UTF8" , CODEC_ID_TEXT}, + {"S_TEXT/ASS" , CODEC_ID_TEXT}, + {"S_TEXT/SSA" , CODEC_ID_TEXT}, {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, {NULL , CODEC_ID_NONE} |