From: Carl Eugen Hoyos Date: Wed, 27 Jan 2010 22:39:18 +0000 (+0000) Subject: Support demuxing Blu-ray subtitles in matroska files. X-Git-Tag: v0.6~1610 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=39c6b3f54c6affb2db6bd021185b874dd05496d6;hp=88248b76afc6e0f01fccec3f92c4fed81d980382 Support demuxing Blu-ray subtitles in matroska files. Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavformat/matroska.c b/libavformat/matroska.c index f101a000b4..f208e329be 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -58,6 +58,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_ASS" , CODEC_ID_SSA}, {"S_SSA" , CODEC_ID_SSA}, {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, + {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE}, {"V_DIRAC" , CODEC_ID_DIRAC}, {"V_MJPEG" , CODEC_ID_MJPEG},