Signed-off-by: SomeRGuy <[email protected]> --- ...9-has-fonts-types-from-RFC-8081-and-.patch | 36 +++++++++++++++++++ libavfilter/vf_subtitles.c | 9 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-Since-mkvmerge-19-has-fonts-types-from-RFC-8081-and-.patch
diff --git a/0001-Since-mkvmerge-19-has-fonts-types-from-RFC-8081-and-.patch b/0001-Since-mkvmerge-19-has-fonts-types-from-RFC-8081-and-.patch new file mode 100644 index 0000000000..b6ae5fb0b5 --- /dev/null +++ b/0001-Since-mkvmerge-19-has-fonts-types-from-RFC-8081-and-.patch @@ -0,0 +1,36 @@ +From be54313b38fdd5f3c232b6153153e4e7159710c8 Mon Sep 17 00:00:00 2001 +From: SomeRGuy <[email protected]> +Date: Sun, 3 Oct 2021 16:48:30 +0300 +Subject: [PATCH] Since mkvmerge 19 has fonts types from RFC 8081 and mkvmerge + 58 on windows use new file/magic library + +Signed-off-by: SomeRGuy <[email protected]> +--- + libavfilter/vf_subtitles.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c +index f08a7fba9d..4168234e9e 100644 +--- a/libavfilter/vf_subtitles.c ++++ b/libavfilter/vf_subtitles.c +@@ -270,9 +270,16 @@ static const AVOption subtitles_options[] = { + }; + + static const char * const font_mimetypes[] = { ++ "font/ttf", ++ "font/otf", ++ "font/sfnt", ++ "font/woff", ++ "font/woff2", ++ "application/font-sfnt", ++ "application/font-woff", ++ "application/x-font-ttf", + "application/x-truetype-font", + "application/vnd.ms-opentype", +- "application/x-font-ttf", + NULL + }; + +-- +2.30.2.windows.1 + diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index f08a7fba9d..4168234e9e 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -270,9 +270,16 @@ static const AVOption subtitles_options[] = { }; static const char * const font_mimetypes[] = { + "font/ttf", + "font/otf", + "font/sfnt", + "font/woff", + "font/woff2", + "application/font-sfnt", + "application/font-woff", + "application/x-font-ttf", "application/x-truetype-font", "application/vnd.ms-opentype", - "application/x-font-ttf", NULL }; -- 2.30.2.windows.1 _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
