diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-03-31 03:31:46 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-03-31 03:44:37 +0300 |
| commit | a8b93d4c81d09d13e37b5a87a3dfa958078cc5f0 (patch) | |
| tree | 761bb73b6aacccb45cf7d150a641ea3fc131e494 /libmpdemux | |
| parent | 9d4d5b4469a16a05226b510e652a4f40099317c0 (diff) | |
| download | mpv-a8b93d4c81d09d13e37b5a87a3dfa958078cc5f0.tar.bz2 mpv-a8b93d4c81d09d13e37b5a87a3dfa958078cc5f0.tar.xz | |
demux_mkv: support Blu-ray subtitles
Recognize "S_HDMV/PGS" CodecID.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index e76a385e3f..e22c0b2eb1 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -613,6 +613,8 @@ static void parse_trackentry(struct demuxer *demuxer, else if (!strcmp(track->codec_id, MKV_S_TEXTASCII) || !strcmp(track->codec_id, MKV_S_TEXTUTF8)) track->subtitle_type = 't'; + else if (!strcmp(track->codec_id, MKV_S_PGS)) + track->subtitle_type = 'p'; mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Codec ID: %s\n", track->codec_id); } else diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 9d634b6c90..c233cd1336 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -78,6 +78,7 @@ #define MKV_S_TEXTSSA "S_TEXT/SSA" #define MKV_S_TEXTASS "S_TEXT/ASS" #define MKV_S_VOBSUB "S_VOBSUB" +#define MKV_S_PGS "S_HDMV/PGS" #define MKV_S_SSA "S_SSA" // Deprecated #define MKV_S_ASS "S_ASS" // Deprecated |