aboutsummaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorAurelien Jacobs2010-07-25 21:16:58 +0000
committerAurelien Jacobs2010-07-25 21:16:58 +0000
commit2701fd40f9bd2fa0ed95c8496cb1e949203f48ab (patch)
tree7f349853a3dd2c5f9a969e540846cc5fe6819424 /libavformat/matroska.c
parent7b53f463b4886ce3b0629b4c7355535f146856e1 (diff)
matroskaenc: add support for muxing SRT tracks
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index dac4735a50..c7e9663316 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -52,6 +52,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"A_WAVPACK4" , CODEC_ID_WAVPACK},
{"S_TEXT/UTF8" , CODEC_ID_TEXT},
+ {"S_TEXT/UTF8" , CODEC_ID_SRT},
{"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/ASS" , CODEC_ID_SSA},
{"S_TEXT/SSA" , CODEC_ID_SSA},