# HG changeset patch # User uau # Date 1166739107 0 # Node ID 8b87dc8cbd5ddc6fdf344cc649c35b1e2ab67059 # Parent 1eaaadda96fa8e13116d9d4cca64dbf359030725 Fix display of multiple simultaneous subtitles without libass. Was broken in r19649. diff -r 1eaaadda96fa -r 8b87dc8cbd5d libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Thu Dec 21 19:42:56 2006 +0000 +++ b/libmpdemux/demux_mkv.c Thu Dec 21 22:11:47 2006 +0000 @@ -2877,7 +2877,9 @@ 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;