Mercurial > mplayer.hg

changeset 21704:8b87dc8cbd5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix display of multiple simultaneous subtitles without libass. Was broken in r19649.
author uau
date Thu, 21 Dec 2006 22:11:47 +0000
parents 1eaaadda96fa
children 829b1f30a07f
files libmpdemux/demux_mkv.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;