From 55b1facb6c67a30bf26563138ab5101713a04cb6 Mon Sep 17 00:00:00 2001 From: eugeni Date: Sat, 12 Jan 2008 01:12:39 +0000 Subject: Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment(). These attachments are passed to libass after demuxer is opened. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index fc842e44c3..d5af904245 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3118,6 +3118,19 @@ if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_D if (mpctx->global_sub_size <= mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id) mpctx->global_sub_size = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id + 1; +#ifdef USE_ASS +if (ass_enabled && ass_library) { + for (i = 0; i < mpctx->demuxer->num_attachments; ++i) { + demux_attachment_t* att = mpctx->demuxer->attachments + i; + if (extract_embedded_fonts && + att->name && att->type && att->data && att->data_size && + (strcmp(att->type, "application/x-truetype-font") == 0 || + strcmp(att->type, "application/x-font") == 0)) + ass_add_font(ass_library, att->name, att->data, att->data_size); + } +} +#endif + current_module="demux_open2"; //file_format=demuxer->file_format; -- cgit v1.2.3