Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'

[ffmpeg] / libavformat / matroska.c

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 394a62f9d34e3398a6cea0b7c09cda14248e5619..519f881e895165b1916eb71ecf19aea2beb06832 100644 (file)
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -66,6 +66,7 @@ const CodecTags ff_mkv_codec_tags[]={
     {"S_ASS"            , AV_CODEC_ID_SSA},
     {"S_SSA"            , AV_CODEC_ID_SSA},
     {"S_VOBSUB"         , AV_CODEC_ID_DVD_SUBTITLE},
+    {"S_DVBSUB"         , AV_CODEC_ID_DVB_SUBTITLE},
     {"S_HDMV/PGS"       , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
 
     {"V_DIRAC"          , AV_CODEC_ID_DIRAC},