| Message ID | 20211003134933.1628-1-wwakabot@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] Since mkvmerge 19 has fonts types from RFC 8081 and mkvmerge 58 on windows use new file/magic library | expand |
| Context | Check | Description |
|---|---|---|
| andriy/commit_msg_x86 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/commit_msg_ppc | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
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 };
Signed-off-by: SomeRGuy <wwakabot@gmail.com> --- libavfilter/vf_subtitles.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)