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 8000F40D82
	for <ffmpegdev@gitmailbox.com>; Tue,  7 Mar 2023 12:34:45 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E6E568BCDC;
	Tue,  7 Mar 2023 14:34:42 +0200 (EET)
Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com
 [203.205.221.202])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5973A689965
 for <ffmpeg-devel@ffmpeg.org>; Tue,  7 Mar 2023 14:34:35 +0200 (EET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
 t=1678192465; bh=WuYlRq8sjknrI9GrgJ4RRZC8VpySWuuJkrQgMPuGYSY=;
 h=From:To:Cc:Subject:Date;
 b=T+Vjd1LsAHZGHZlsmQ1K2aTjjLyHRdhjYCF+wWw9hvALhEULt7HTlLFS2wc4ax68D
 MkNlOshMjNnQj4WT0YqLtI+qr3HryQPmClYKbNU3kUXs/Tp5q9rUEZWPE3Upfo4nsJ
 JKR2Joz+7SmIlZsYW+XzzndQF9rB9fRCTm/EiSN0=
Received: from localhost.localdomain ([103.107.216.225])
 by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP
 id 89711E4E; Tue, 07 Mar 2023 20:34:23 +0800
X-QQ-mid: xmsmtpt1678192463tz6qkiypc
Message-ID: <tencent_5FEB93A291A4AB1D5FCD5042F2AA4AC5E306@qq.com>
X-QQ-XMAILINFO: NH/MJuLMiCfotcRuoqZsf2LRmtKYLwdV6kbI+AfMDxAY+vyg9JggfbQihYDTEJ
 sBGPdptlbe/QaaAiapR3DWyr/rSGhYlQRm5Ybs9dGNUpFjQhZIrS06br3kuWLxtdik5ImZxoNJi/
 3yvlPVJJcJ/91CfW+gT+PQ8fp5ueTm0yC8+LQkp0ZKWNprxryjBSy6/phjXlTrCBZyqL1xpW7tU+
 33V4nzEDVQkyrdEDgkFF3+Xl5vM3RdyA1jGyXGXOA+kghX5yasIUHxMDxg5ZIukrsAUkzrqXXWwK
 2qlhgUJsTW8HfSsxn070S/QKK0aA9Pnb2FYqZZhtGT/g+naKTTR/AbH5Uug1VCpmOqNRUVrn4KaS
 yhohcKzwywq9A3t4NmwOoluY5iVv2xtRIZEv3aRadyIEaVk6f2sRYybs2SHSM34V615+dO/0BN1p
 C1XU8rhJEc3Q9FBffJZbnxtaMQs6PV2Aaus1dwVkhurerMTpuqksyAi0hgS4gVnPe6fEcRq1BjT7
 Ln5OvhyJ2WaLRtenTS93byh24qh+hcz3yQxEr5g3AuTYHSWTM3bjwdKP877+4U8jXpFYxdE1uMJK
 +Bwc/4GegxuRk4XreZFk72OdPVVlXlkbbhE/JQNu/dl21ezfi1rPOavDR8QUL8IulRq0lmNMbtAa
 OVlOCk59Y6GrqXh5MQdkNoTto/ynTxbuBfbd/6xCx59x2ZWhaehi+gh/bGZG8nARBU8qcEsoWdLn
 uayZpscA7/GhnI7gE7uTIsgdR2vtUaSbvKX7+jV9EPLWQv7fA6N65otX8PM5qLGS6jsmXurAejmI
 iCFFpodRf1dCL7Bv+tmziYrdqlPpdpJcCMcJOQjl0aQ8EJ5vmCYdU7wcdBJea6qGhchHEtMoBAxW
 b1y6BPoLNFayU65rR6bzpKmYvYnYguwtu+t+3L41AG4mrSNDOdaXEjMPrnEG3/C/R+7p9AeFiD
From: 1035567130@qq.com
To: ffmpeg-devel@ffmpeg.org
Date: Tue,  7 Mar 2023 20:34:18 +0800
X-OQ-MSGID: <20230307123418.5619-1-1035567130@qq.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] libavformat/img2dec: fix unable to find svg
 format when the svg resources start with "<svg"
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_5FEB93A291A4AB1D5FCD5042F2AA4AC5E306@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.

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

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 5a63d7c81d..448a574b59 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -25,6 +25,7 @@
 #define _DEFAULT_SOURCE
 #define _BSD_SOURCE
 #include <sys/stat.h>
+#include <ctype.h>
 #include "libavutil/avstring.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
@@ -964,18 +965,19 @@ 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 && isspace(*b)) b++;
+    if (b >= end - 5) return 0;
+    if (memcmp(p->buf, "<?xml", 5) && memcmp(b, "<svg", 4))
         return 0;
     while (b < end) {
         int inc = ff_subtitles_next_line(b);
         if (!inc)
             break;
+        if (!memcmp(b, "<svg", 4))
+            return AVPROBE_SCORE_EXTENSION + 1;
         b += inc;
         if (b >= end - 4)
             return 0;
-        if (!memcmp(b, "<svg", 4))
-            return AVPROBE_SCORE_EXTENSION + 1;
     }
     return 0;
 }
-- 
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".