Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / matroska.c

diff --git a/ffmpeg/libavformat/matroska.c b/ffmpeg/libavformat/matroska.c
index 272d235fe6bd04d3abafb3121f5c2ca0be92e510..bc5007a43358dcbe15089f03d432a025c70f3bce 100644 (file)
--- a/ffmpeg/libavformat/matroska.c
+++ b/ffmpeg/libavformat/matroska.c
@@ -66,7 +66,6 @@ const CodecTags ff_mkv_codec_tags[]={
 
     {"S_TEXT/UTF8"      , AV_CODEC_ID_SUBRIP},
     {"S_TEXT/UTF8"      , AV_CODEC_ID_TEXT},
-    {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
     {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , AV_CODEC_ID_ASS},
     {"S_TEXT/SSA"       , AV_CODEC_ID_ASS},