summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-15 19:35:06 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-15 19:35:06 +0000
commit8d4098a160611f0f4a5b7bbd2ca45a57338402e6 (patch)
tree9b4577d98ccfc3adbfdf0ecd6294c7b05a8118d9 /libmpdemux/demux_mkv.c
parentd2a6593315a21176d6629ab8d4a0267c1bf390b6 (diff)
downloadmpv-8d4098a160611f0f4a5b7bbd2ca45a57338402e6.tar.bz2
mpv-8d4098a160611f0f4a5b7bbd2ca45a57338402e6.tar.xz
VobSub tracks cannot be handled by libass, do not mark them with 'a'.
This fixes the bug with VobSub not being displayed with -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 734846123f..802e5005c8 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2376,7 +2376,8 @@ demux_mkv_parse_ass_data (demuxer_t *demuxer)
for (i = 0; i < mkv_d->num_tracks; i++)
{
track = mkv_d->tracks[i];
- if (track->type != MATROSKA_TRACK_SUBTITLE)
+ if (track->type != MATROSKA_TRACK_SUBTITLE ||
+ track->subtitle_type == MATROSKA_SUBTYPE_VOBSUB)
continue;
track->sh_sub.type = 'a';