summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorLeo Izen <leo.izen@gmail.com>2017-12-12 21:19:51 -0500
committerJan Ekström <jeebjp@gmail.com>2017-12-13 21:00:22 +0200
commitf3d2f4c6c2a57a03daa824db2eb7a544ce56f81a (patch)
tree57c6893e108ebe56a32ebaa8d7537fafbe08ef91 /sub
parent26cdd52801db325bba5aaedc1b3544d086049fd6 (diff)
downloadmpv-f3d2f4c6c2a57a03daa824db2eb7a544ce56f81a.tar.bz2
mpv-f3d2f4c6c2a57a03daa824db2eb7a544ce56f81a.tar.xz
sd_ass: accept RFC8081 font media types
IETF RFC8081 added the "font" top-level media type, including font/ttf, font/otf, font/sfnt, and also font/collection. These font formats are all supported by mpv/libass but they are not accepted as valid Matroska mime types. mpv can load them via file extension and they work as expected, so files using the new types should not trigger a warning from mpv.
Diffstat (limited to 'sub')
-rw-r--r--sub/sd_ass.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 8a21ea0f42..7fa7deccfa 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -87,6 +87,10 @@ static const char *const font_mimetypes[] = {
"application/vnd.ms-opentype",
"application/x-font-ttf",
"application/x-font", // probably incorrect
+ "font/collection",
+ "font/otf",
+ "font/sfnt",
+ "font/ttf",
NULL
};