From b784346e789814362e196e513a8988cd02d96bac Mon Sep 17 00:00:00 2001 From: Grigori Goronzy Date: Tue, 1 Jun 2010 22:49:22 +0200 Subject: libass: match font attachments based on extension Instead of only relying on the MIME type, use the file extension as a fallback for deciding which attachments are fonts and should be fed to libass. This also refactors the check into a separate function in mpcommon. --- mplayer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index fdead085ba..6be87667cc 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3756,10 +3756,7 @@ if (opts->ass_enabled && ass_library) { struct demuxer *d = mpctx->sources[j].demuxer; for (int i = 0; i < d->num_attachments; i++) { struct demux_attachment *att = d->attachments + i; - if (use_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)) + if (use_embedded_fonts && attachment_is_font(att)) ass_add_font(ass_library, att->name, att->data, att->data_size); } } -- cgit v1.2.3