From patchwork Sun Oct 3 13:49:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SomeRGuy X-Patchwork-Id: 30893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3442116iob; Sun, 3 Oct 2021 06:50:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyGc0hsxjIbsQNX2OcJHmIvjltNbz+Ij80wz+YxhW48BNHtG3P45HvTlByKohm+XpGcdnq X-Received: by 2002:a17:906:a018:: with SMTP id p24mr10476587ejy.349.1633269016474; Sun, 03 Oct 2021 06:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633269016; cv=none; d=google.com; s=arc-20160816; b=eLRCy3oTHKdsfrAsjj4INqCwRTYYLmzApvt5ZIGcQ22qTGUkbVtpt6xteZgTQvj8Yz EBqA7oBl3SGa9REEI1Pa34KQwscNvH6dLB/gUdLuYbE2m1w5ySgoEmqweJEdDyXVVF0f b3RqgyOLvZcx1C0HB9PT3nFmvU97XMo+8WVcaoKAhBb02ke2SNekFT3OUpAXOMi6UqhZ 6LKMvtqG5q+R8gdLKk+uU/+0qPhEd2SIRtc08lO6jlPupLRjbZu5mp/SC/Wp1NXPOA2Q XPazSJzneMpQnBUWGCCTFjCTI0ZDBUq56BNzHPAXcSL+IENSkRz9dwuFIZA9cu8csUHE efFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=sZByrhbEixpGiQV5MgYEMQfrfbFwZ9k8GtsynfNFE9s=; b=HjrYIRbYq3gX56FIpqA9j+k5cUFu0e0htSJAEeF3/+oq8trDS4IfSA+kMGxVER925G PDt6LSagFuqSRPmhXmyUsFvsqSgun5gSBjOiRSB3YEky+dCJeFdhBLoxqkue4rOPZYIc vN89ixS/ZLcjgKDOC75lHGigVNR1ua0zi1tDTgB6jqu5m7ZbGvO68VR+RYsERdgtRZZ5 uBhDiKx3Uv6/Cvd35s2AL+8U4YYyG1DLGvFBAjjjbYF7BCMRUpL4FjTiZ3bOep0RW9Oc m9yi+tJbBpy9V6Kh5HMD8qexq/VDquRLvvVtIeYpnt60UMzEOHjY2thrgmYzh+DUhVDI mCFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=K0WTSSnT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w10si16526240edd.545.2021.10.03.06.50.16; Sun, 03 Oct 2021 06:50:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=K0WTSSnT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CC9D68A84E; Sun, 3 Oct 2021 16:50:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B94868A6B0 for ; Sun, 3 Oct 2021 16:50:06 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id d6so25139521wrc.11 for ; Sun, 03 Oct 2021 06:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+KWn1PW5QbjqIjAyxZitKF3M02+GQuQpmt5N6L6vEHA=; b=K0WTSSnTahvyWSRyEa72YhULRIMsURdDRwp3LzbbDp389SBHIBiujw+WGf3V/tK9Kt u58OWrOZ+T/PHHaL7Xmc4/rWQtDVnYvhR0Pd/Bj8it4iVKizPlhEqJwgj7+dWo5//0Zp kAbYpl7RLG2IMUg4RyK3kcJmU3n4dXXzC1wldxxRaIg6l3CaCQMbqnF6R3M0KqyAJOt7 Fiz+BbGFneXhxRr0DmV8ocL3OM2fghBt/eQ4Ny8ThjqjN3wqcqgaJ7tKtHEr2wpzRCEV IqMRqILoHYG+oX+8pw+sLt1N6xxysw1EUeT6/WZD9l/vpxep36wh0YynpCQTU671ldPT OhQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+KWn1PW5QbjqIjAyxZitKF3M02+GQuQpmt5N6L6vEHA=; b=4t6saXITPYAgbbJd5iZODbO5GiL/hOSLunR5GNE59VHYE+nQ//hdbXQp0qRxwO0pnK 1/8Jmg0FuQ7EyaQhfuJ2EegXnxDq5A/23zJV/Z8dEa09DY1o1vLSyqAaYNGMjx0HUn+s er0aPSLW7dkqzJ04HrWjpEZDgFoS8Ih/PX6uWBvCzI63Pk5ohqtoLqu7iSRW9wRxnMWP Jx8cB3plmcUaxjHUtz6h3P2CRrrLlG0UXu2psskt37lvgaVUQDXKF43Holw+B5wWpXTe s9NNsetBTQNpH9EHfLrSxGdRJ/1C+R/jB324LNDmX1Hovq58/qMcH/G1y3jtqirqgmhq Uu1g== X-Gm-Message-State: AOAM530tUmna5y25lyMDgr3H6dDpQhJYzyszkSQ4sp8eE35BAEzZgtdG tYm4JkAJr2wHSAp1a8JQ4GZ38/8Y1dXW8Q== X-Received: by 2002:a5d:6da9:: with SMTP id u9mr8751079wrs.155.1633269005526; Sun, 03 Oct 2021 06:50:05 -0700 (PDT) Received: from localhost.localdomain ([84.17.42.35]) by smtp.gmail.com with ESMTPSA id c14sm11315481wrd.50.2021.10.03.06.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 06:50:04 -0700 (PDT) From: SomeRGuy To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 16:49:33 +0300 Message-Id: <20211003134933.1628-1-wwakabot@gmail.com> X-Mailer: git-send-email 2.30.2.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Since mkvmerge 19 has fonts types from RFC 8081 and mkvmerge 58 on windows use new file/magic library X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: SomeRGuy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: octalP2dyoHh Signed-off-by: SomeRGuy --- 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 };