aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@gmail.com>2017-02-06 09:41:03 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-07 21:32:08 +0100
commitdface53497c3531da101b2872df301acca313142 (patch)
tree7cb2ab90d0d4e720b865fd22ef07bac15b9227e4 /libavformat
parente87a4a85c11e348be8682acf39573fd2c5e22193 (diff)
downloadffmpeg-dface53497c3531da101b2872df301acca313142.tar.gz
matroska: demux BluRay text subtitles
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroska.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index c8e53416d3..fda96fb014 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -74,6 +74,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE},
{"S_DVBSUB" , AV_CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
+ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE},
{"V_DIRAC" , AV_CODEC_ID_DIRAC},
{"V_MJPEG" , AV_CODEC_ID_MJPEG},