[FFmpeg-cvslog] matroska: Always consider S_TEXT/UTF8 as SRT when demuxing

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Feb 19 13:49:43 2016 +0100| [bf7be043fcfda29c81ef2268885b4ccc643e7c49] | committer: Luca Barbato

matroska: Always consider S_TEXT/UTF8 as SRT when demuxing

Reported-By: Maxim Koitsov <maksbotan at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf7be043fcfda29c81ef2268885b4ccc643e7c49
---

 libavformat/matroska.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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},