Mercurial > libavformat.hg

comparison matroska.c @ 2245:223a74395827 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for ASS like subtitles in Matroska
author aurel
date Wed, 11 Jul 2007 13:37:07 +0000
parents 93ffcd9d826f
children e48ed322f893
comparison
equal deleted inserted replaced
2244:93ffcd9d826f 2245:223a74395827
59 {"A_REAL/COOK" , CODEC_ID_COOK}, 59 {"A_REAL/COOK" , CODEC_ID_COOK},
60 // {"A_REAL/SIPR" , CODEC_ID_SIPRO}, 60 // {"A_REAL/SIPR" , CODEC_ID_SIPRO},
61 61
62 {"S_TEXT/ASCII" , CODEC_ID_TEXT}, 62 {"S_TEXT/ASCII" , CODEC_ID_TEXT},
63 {"S_TEXT/UTF8" , CODEC_ID_TEXT}, 63 {"S_TEXT/UTF8" , CODEC_ID_TEXT},
64 {"S_TEXT/ASS" , CODEC_ID_TEXT},
65 {"S_TEXT/SSA" , CODEC_ID_TEXT},
64 {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, 66 {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
65 67
66 {NULL , CODEC_ID_NONE} 68 {NULL , CODEC_ID_NONE}
67 /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */ 69 /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
68 }; 70 };