[MPlayer-cvslog] r19649 - in trunk: libass/ass_mp.c libass/ass_mp.h libmpdemux/demux_mkv.c

[Uoti Urpala]

On Sat, 2006-09-02 at 22:46 +0200, eugeni wrote:
> Modified: trunk/libmpdemux/demux_mkv.c
> ==============================================================================
>  static void
> +clear_subtitles(demuxer_t *demuxer, uint64_t timecode, int clear_all);
> +
> +static void

> @@ -2831,6 +2841,7 @@
>      ass_process_chunk(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration);
>      return;
>    }
> +  clear_subtitles(demuxer, timecode, 1);
>  #endif

This results in

#ifdef USE_ASS
  if (ass_enabled && track->subtitle_type == MATROSKA_SUBTYPE_SSA) {
    ass_process_chunk(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration);
    return;
  }
  clear_subtitles(demuxer, timecode, 1);
#endif

Which is nonsense (if USE_ASS is defined modifies behavior when libass
is NOT used), and breaks display of multiple subtitle packets in that
case.

Should the clear_subtitles() line be simply removed or did you intend it
to be somewhere else? It doesn't seem useful anywhere unless you can
turn libass rendering on during playback though.