From bf7be043fcfda29c81ef2268885b4ccc643e7c49 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 19 Feb 2016 13:49:43 +0100 Subject: matroska: Always consider S_TEXT/UTF8 as SRT when demuxing Reported-By: Maxim Koitsov --- libavformat/matroska.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/matroska.c') diff --git a/libavformat/matroska.c b/libavformat/matroska.c index eca1e41..a57b963 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -55,8 +55,8 @@ 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_TEXT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASS" , AV_CODEC_ID_SSA}, {"S_TEXT/SSA" , AV_CODEC_ID_SSA}, -- cgit v1.1