summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-22 22:11:01 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-22 22:11:01 +0000
commit5762122f3768886f24446588f8f1006b660abf8b (patch)
tree26f63561802f80e82d12687a2818f18395353558 /libmpdemux/demux_mkv.c
parent7764a187e0449a9a205f3c6172de8934116682a4 (diff)
downloadmpv-5762122f3768886f24446588f8f1006b660abf8b.tar.bz2
mpv-5762122f3768886f24446588f8f1006b660abf8b.tar.xz
SSA/ASS parser reworked, with 2 main results:
support for script embedded fonts (fonts, uuencoded directly into script) added; matroska interface functions have got more sensible names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index e3f5c5386b..62a54b960b 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2309,7 +2309,7 @@ demux_mkv_parse_ass_data (demuxer_t *demuxer)
}
track->sh_sub.type = 'a';
track->sh_sub.ass_track = ass_new_track();
- ass_process_chunk(track->sh_sub.ass_track, track->private_data, track->private_size);
+ ass_process_codec_private(track->sh_sub.ass_track, track->private_data, track->private_size);
}
}
#endif
@@ -2800,7 +2800,7 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
#ifdef USE_ASS
if (ass_enabled && track->subtitle_type == MATROSKA_SUBTYPE_SSA) {
- ass_process_line(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration);
+ ass_process_chunk(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration);
return;
}
#endif