diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-27 22:39:18 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-27 22:39:18 +0000 |
| commit | 39c6b3f54c6affb2db6bd021185b874dd05496d6 (patch) | |
| tree | 67ed01f4e2a0b5118a4ecc514c8cc9613ba03daa /libavformat/matroska.c | |
| parent | 88248b76afc6e0f01fccec3f92c4fed81d980382 (diff) | |
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
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 1 |
1 files changed, 1 insertions, 0 deletions
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}, |