mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Fixed the subtitle line overflowing for SSA if there were too many \N in the subs.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11809 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mosu 2004-01-19 19:51:07 +00:00
parent d6fad182c2
commit c08585dc56
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmpdemux/demux_mkv.c
View File

@ -2265,6 +2265,12 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
mkv_d->clear_subs_at[mkv_d->subs.lines++]
= timecode + block_duration;
*ptr2 = '\0';
if (mkv_d->subs.lines >= SUB_MAX_TEXT)
{
mp_msg (MSGT_DEMUX, MSGL_WARN, "[mkv] Warning: too many "
"sublines to render, skipping\n");
return;
}
ptr2 = mkv_d->subs.text[mkv_d->subs.lines];
ptr1 += 2;
}
@ -2282,11 +2288,15 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
{
if (state == 0) /* normal char --> newline */
{
if (mkv_d->subs.lines == SUB_MAX_TEXT - 1)
break;
*ptr2 = '\0';
mkv_d->clear_subs_at[mkv_d->subs.lines++]
= timecode + block_duration;
if (mkv_d->subs.lines >= SUB_MAX_TEXT)
{
mp_msg (MSGT_DEMUX, MSGL_WARN, "[mkv] Warning: too many "
"sublines to render, skipping\n");
return;
}
ptr2 = mkv_d->subs.text[mkv_d->subs.lines];
state = 1;
}