summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-29 13:49:01 +0100
committerwm4 <wm4@nowhere>2013-12-29 14:19:22 +0100
commit15f38b89eeb7cbb72a84dabc19b706ede455399c (patch)
treecd6ee34619b4caa14a6324fbfa1e7c6e3d1612eb
parent6878cf283292fe5962ed3ff53fc25ae16de8a8fc (diff)
downloadmpv-15f38b89eeb7cbb72a84dabc19b706ede455399c.tar.bz2
mpv-15f38b89eeb7cbb72a84dabc19b706ede455399c.tar.xz
player: add two more font mimetypes recognized by Haali
The Haali Matroska splitter is basically the reference implementation for this crap, and it knows only: application/vnd.ms-opentype application/x-font-ttf application/x-truetype-font Two of them were missing in our code. One of them, "application/x-font", is probably plain incorrect, but I can't really tell. Also see: http://www.cccp-project.net/beta/test_files/fontsample.mkv
-rw-r--r--player/loadfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index f527cb852d..402b30c5be 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -845,7 +845,9 @@ static void open_subtitles_from_resolve(struct MPContext *mpctx)
static const char *font_mimetypes[] = {
"application/x-truetype-font",
- "application/x-font",
+ "application/vnd.ms-opentype",
+ "application/x-font-ttf",
+ "application/x-font", // probably incorrect
NULL
};