[MPlayer-cvslog] r21720 - trunk/libmpdemux/demux_mkv.c

[uau]

Author: uau
Date: Thu Dec 21 23:11:47 2006
New Revision: 21720

Modified:
   trunk/libmpdemux/demux_mkv.c

Log:
Fix display of multiple simultaneous subtitles without libass.
Was broken in r19649.


Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Thu Dec 21 23:11:47 2006
@@ -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;