[FFmpeg-devel] [PATCH 2/2] matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.

Philip Langdale philipl at overt.org
Sun Aug 12 05:41:26 CEST 2012


While not explicitly stated in the specs, the original author
has stated that S_TEXT/UTF-8 is expected to be text using Subrip
markup, but withotu Subrip in-band timing.

So, now that we have a decoder that conforms to this expectation,
let's use it.

Signed-off-by: Philip Langdale <philipl at overt.org>
---
 libavformat/matroska.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index b386d74..b9933d3 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -53,8 +53,7 @@ const CodecTags ff_mkv_codec_tags[]={
     {"A_VORBIS"         , AV_CODEC_ID_VORBIS},
     {"A_WAVPACK4"       , AV_CODEC_ID_WAVPACK},
 
-    {"S_TEXT/UTF8"      , AV_CODEC_ID_TEXT},
-    {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
+    {"S_TEXT/UTF8"      , AV_CODEC_ID_SUBRIP},
     {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},
     {"S_TEXT/SSA"       , AV_CODEC_ID_SSA},
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list