--- libav-11.6/libavcodec/avcodec.h.orig	2016-03-09 11:46:41.000000000 +0000
+++ libav-11.6/libavcodec/avcodec.h	2016-08-18 06:11:48.502275521 +0000
@@ -454,6 +454,7 @@ enum AVCodecID {
     AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
     AV_CODEC_ID_DVB_SUBTITLE,
     AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
+    AV_CODEC_ID_SUBRIP,  ///< raw UTF-8 text
     AV_CODEC_ID_XSUB,
     AV_CODEC_ID_SSA,
     AV_CODEC_ID_MOV_TEXT,
--- libav-11.6/libavcodec/codec_desc.c.orig	2016-03-09 11:46:41.000000000 +0000
+++ libav-11.6/libavcodec/codec_desc.c	2016-08-18 06:12:52.752119099 +0000
@@ -2313,6 +2313,12 @@ static const AVCodecDescriptor codec_des
         .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),
     },
     {
+        .id        = AV_CODEC_ID_SUBRIP,
+        .type      = AVMEDIA_TYPE_SUBTITLE,
+        .name      = "text",
+        .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),
+    },
+    {
         .id        = AV_CODEC_ID_XSUB,
         .type      = AVMEDIA_TYPE_SUBTITLE,
         .name      = "xsub",
--- libav-11.6/libavformat/matroska.c.orig	2016-03-09 11:46:41.000000000 +0000
+++ libav-11.6/libavformat/matroska.c	2016-08-18 05:56:28.801829063 +0000
@@ -56,6 +56,7 @@ const CodecTags ff_mkv_codec_tags[]={
     {"A_WAVPACK4"       , AV_CODEC_ID_WAVPACK},
 
     {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
+    {"S_TEXT/UTF8"      , AV_CODEC_ID_SUBRIP},
     {"S_TEXT/UTF8"      , AV_CODEC_ID_TEXT},
     {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},
--- libav-11.6/libavformat/matroskadec.c.orig	2016-03-09 11:46:41.000000000 +0000
+++ libav-11.6/libavformat/matroskadec.c	2016-08-18 05:56:28.802829045 +0000
@@ -2293,7 +2293,7 @@ static int matroska_parse_frame(Matroska
     else
         pkt->pts = timecode;
     pkt->pos = pos;
-    if (st->codec->codec_id == AV_CODEC_ID_TEXT)
+    if (st->codec->codec_id == AV_CODEC_ID_SUBRIP)
         pkt->convergence_duration = duration;
     else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
         pkt->duration = duration;