From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id B3F8E42337
	for <ffmpegdev@gitmailbox.com>; Thu,  9 Mar 2023 09:29:35 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5343168BC90;
	Thu,  9 Mar 2023 11:29:33 +0200 (EET)
Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com
 [162.62.57.252])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A73468B8C3
 for <ffmpeg-devel@ffmpeg.org>; Thu,  9 Mar 2023 11:29:26 +0200 (EET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
 t=1678354158; bh=QfMEMGKPFH6SUjLwRUKEFZ2BF/U+7KhK9nsSN04e+Ss=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=L5x8bfzetH70cL7XiqlbOhXZAJyAy1ZZJmMTjbxjv9/VXeBSTO5PeEMFnBFSUpZDG
 4/nrHCxBSYkBwD2rl6P8f+pOBnOqOfamdIdPmomUVrXOBT7T4aZZS4NM+r1+KfSMv9
 g8cc628ZpqxTNlkkS0Sk4tpj1YeiwNsWPZ1CdYIM=
Received: from localhost.localdomain ([103.107.216.225])
 by newxmesmtplogicsvrszc1-0.qq.com (NewEsmtp) with SMTP
 id 74FADC6D; Thu, 09 Mar 2023 17:29:15 +0800
X-QQ-mid: xmsmtpt1678354155t8ahwjyfr
Message-ID: <tencent_0EDC47942748A370D70D3EB321BF645F1507@qq.com>
X-QQ-XMAILINFO: NQR8mRxMnur9J9M0sLKphB6F8BleQDaMY9swe+JWeNxcWzMnr604eiApiqemvF
 XUwdBlWwK4KJCU97U7fchQQSQI3c+bX+PkqgpHodY6TlU7ZzkFSgxD5MRMy0jslY8U6HW2sa0Rm2
 zDylQKv4S43oJmch2kRgsdYhJkShUetqv+KPnZIrvNfy9b85psfDNvBx3TmOl2fPiUPd5/Zk1d/+
 7/me7f1f1wXXdkgKDs/WNCyYBatgwHppMJhzCgl0G+Cf1ohipY/tr5bI9dh1/A7B3Pj8A7LLBrNK
 PxqqPn5h0c+3KrBncjB4juKrMT56+bNrYkWfpTYEWQ4NoDyEUSIgE2GX3yIH1eznuoPpoPdyrUi3
 RrI5xwx9X635wBikx8PFkGaVA8o7+NF5TkhQu/yuFjjFX9fmcPUP45xcQ2oohftfNGMibaB+WrfS
 u2csi98lcjgYFI0z1uMqu9sT/D+G0bXkBdVtJMYKgg132jk6/ASeFa4ImRrr8jN3WTymWAgOEO6v
 Gk7RkqZ4OlLx5KlZ1ACh9URqFhynXfnoKohkHeDOrEhNhvV5x17mV9UV5LuovhHLZXLt/R3M3k3C
 6K4/fFBZa1mtfx3qxTtU7j/chFEgKjAeLx7+sngCnwIgaGk5mHhqlRb0qI4c1c9EQfsgkFhQR1SA
 vvMVOOM61UIpUMZU0jbIwGq64dEjEJXOeUAb0a1xSMXUNtk50dw8yGnj7m8np4Dbf6yPk0p0W0zT
 NeI4XvJvQJmHKs4//uObLW57ydQEQYEaEEa4bpYrmyXgdHJbMD16FuwYRDcIZFX+eUmLzq9YEO/9
 y4ssI+zeUu964rhcQ2pxWWukdUAqDjNpg8ZKGvwjPoCGULaB97k1NM86xVOMDVw/K13LOgbFL2rk
 xGwaQeZ2d0OEPMnPPUVZt1Zdcof7k5YEOCYjaWYUqeZfThkd01sAoGojbvnLSwYmjQQ6GnujuR
From: 1035567130@qq.com
To: ffmpeg-devel@ffmpeg.org
Date: Thu,  9 Mar 2023 17:29:12 +0800
X-OQ-MSGID: <20230309092912.43160-1-1035567130@qq.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <tencent_5FEB93A291A4AB1D5FCD5042F2AA4AC5E306@qq.com>
References: <tencent_5FEB93A291A4AB1D5FCD5042F2AA4AC5E306@qq.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2] libavformat/img2dec: fix unable to find
 svg format when the svg resources start with "<svg" or "<!---"
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Wang Yaqiang <wangyaqiang03@kuaishou.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/tencent_0EDC47942748A370D70D3EB321BF645F1507@qq.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

From: Wang Yaqiang <wangyaqiang03@kuaishou.com>

svg is xml, but <?xml is not required,
it can start with <svg and can have multiple empty lines,
or start with <!--- include some comments,
but must first line if start with <?xml.

Signed-off-by: Wang Yaqiang <wangyaqiang03@kuaishou.com>
---
 libavformat/img2dec.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 5a63d7c81d..3488600400 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -964,8 +964,13 @@ static int svg_probe(const AVProbeData *p)
 {
     const uint8_t *b = p->buf;
     const uint8_t *end = p->buf + p->buf_size;
-
-    if (memcmp(p->buf, "<?xml", 5))
+    while (b && b < end && av_isspace(*b)) b++;
+    if (b >= end - 5)
+        return 0;
+    if (!memcmp(b, "<svg", 4)) {
+        return AVPROBE_SCORE_EXTENSION + 1;
+    }
+    if (memcmp(p->buf, "<?xml", 5) && memcmp(b, "<!--", 4))
         return 0;
     while (b < end) {
         int inc = ff_subtitles_next_line(b);
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".