diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-21 22:11:47 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-21 22:11:47 +0000 |
| commit | 29a0a85b48557cc08ec4ac7e95711644bd03c017 (patch) | |
| tree | 92edcd12b5b7188a3c434711779dab757d6e0a41 /libmpdemux | |
| parent | fedb4f7bd6134adb46202bb87a6ec9c8aed4593a (diff) | |
| download | mpv-29a0a85b48557cc08ec4ac7e95711644bd03c017.tar.bz2 mpv-29a0a85b48557cc08ec4ac7e95711644bd03c017.tar.xz | |
Fix display of multiple simultaneous subtitles without libass.
Was broken in r19649.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 802e5005c8..ed299cf978 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -2877,7 +2877,9 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block, ass_process_chunk(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration); return; } - clear_subtitles(demuxer, timecode, 1); + // Use code below only to parse this single sub, old subs timed in libass + if (ass_enabled) + clear_subtitles(demuxer, timecode, 1); #endif ptr1 = block; |