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. --- mpcommon.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'mpcommon.c') diff --git a/mpcommon.c b/mpcommon.c index 61d61c743c..5756b8ad6a 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -297,6 +297,24 @@ int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang) return demuxer->audio->id; } +bool attachment_is_font(struct demux_attachment *att) +{ + if (!att->name || !att->type || !att->data || !att->data_size) + return false; + // match against MIME types + if (strcmp(att->type, "application/x-truetype-font") == 0 + || strcmp(att->type, "application/x-font") == 0) + return true; + // fallback: match against file extension + if (strlen(att->name) > 4) { + char *ext = att->name + strlen(att->name) - 4; + if (strcasecmp(ext, ".ttf") == 0 || strcasecmp(ext, ".ttc") == 0 + || strcasecmp(ext, ".otf") == 0) + return true; + } + return false; +} + /* Parse -noconfig common to both programs */ int disable_system_conf=0; int disable_user_conf=0; -- cgit v1.2.3