From patchwork Mon May 22 14:07:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1747525pzb; Mon, 22 May 2023 07:08:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4fc8usK1j3Nb/HxQQcc0iu9PPrxtY83h/3uIL4FEAPl35d4a3Isgy/qCHM3kOU5WKhtzF8 X-Received: by 2002:a17:907:9719:b0:96f:c988:941 with SMTP id jg25-20020a170907971900b0096fc9880941mr5025680ejc.15.1684764502253; Mon, 22 May 2023 07:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684764502; cv=none; d=google.com; s=arc-20160816; b=oUv19bnqaIeaGOn702iZqlmD8ILB1c2BRk49f0w03A3wC0GQPuEawqbux40q5lmjH1 90FGkHyh7F1MWRF+eBVqG5zpL4MakGytIUjuNfFNWcfLEYSV8uFciPon942MnywlVmjr JR2ejyRUCNk2s8GMygHon0HhnGh6WBbHUCLB8i8nri9w5RtfmW06Hl1jPvq1vdWOH9fu WlW8Yx9v+UOwEgI2ZGBsiUJcsL/XJ4m8B9FX/5x4sA4euHKKnDjl3PbOouPKaUSOPhxS fkUulv+DI2PhOo7ak3wXCx58uF6KxRmiQL41AYk/16GoUIVu2d5V0ikwOkHWXsJjIiRo a6hw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=uia4mIu7K+xeUEBLxCuOlYL4rS3jkgaxsd6YPoVO8PM=; b=aAWhSlUDOHo3i/vZ2xyRU4u47qy16uoEA/SRAaY8e55sdS6RncNhpRT+BUIC0ceac8 WxlJ8A7hmOhb7tZ+WEAixNobJaSZGKZ7hH6Fx8pRUhPCAjn9x0kD73OyjZujZu3vW+jw k8NKphjJWHuoOrHshYBgITy6M4PK4ko0F31HNTVA27TifAeU0a/HDHBe4yH5WYfSa+vl jO6XyvFZBFcvbpSRHMza7mkAfCWo0Ei3wNsAAadNN3z16YCXNyCstegFkQWhRjdKwz+c PT3xI3E8G9inYSN4x98pQkxgkL/vVHYGdnAHzeEk7yXuk5SGdUqPXH4HsnXr+gvzoKVd js8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="jKJsNdp/"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id md5-20020a170906ae8500b009537a538319si3178876ejb.750.2023.05.22.07.08.20; Mon, 22 May 2023 07:08:22 -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=@foxmail.com header.s=s201512 header.b="jKJsNdp/"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02FA768C060; Mon, 22 May 2023 17:08:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6599B680043 for ; Mon, 22 May 2023 17:08:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1684764479; bh=bJwuReOcfmcRf+X+A14qFcAMb6zKNXqA+Qk+Q+gMVVU=; h=From:To:Cc:Subject:Date; b=jKJsNdp/JOUd8a0neVSWCgNjnNUP7AYNvRDbRuIPAirmClSTMWdkJDCTTTNW1mE/y hj3bn0wZoISqea56YWD3VkpCEHDBEdEY+UOD7fnC4u9XWTb0VLhxaHfY8KWGpf8okX nGej7Va4NfzGuQuy/MWSJuTZgQWiwlVYFj+b528I= Received: from ZHILIZHAO-MB2.tencent.com ([119.147.10.196]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id 1F513AE6; Mon, 22 May 2023 22:07:53 +0800 X-QQ-mid: xmsmtpt1684764473tvmyik14z Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur9aNTWWaKG5urxSeh0geTnHmduUcRLpnwm9P4E4tHg/sEThagWER Ej7KwEe723wqiOTaG2iPCJfR8HGjY8hlFqFuZVSKG8wxWs6qKJNxaDZKuJ8iHaQufqaYZcuog1iT lVDNTeWUfrRIMZxtyeJd96ck8VIhWtG1ry8+byxARcebwVVLJQWVir43XUk9RRWjuUEoxAjTGqkG RMs5dMgOxYYDx2O3tpYoCm8vH3wo7FI9tiW698gJl5lIZgdorGJqoJOo+fRNbf2inryaEwOOoZtX +x3ZzMhpac9Pji+JQFb91llVkJdzjfjJxX3Ud8vY1dIACpu+LUYI2YxskaX0AGL0RdA5cSEc3Kvi Mq+mECLsrudl1uaqeYQDTQo6q4uah4jyZsOnhR4EFzk0KfhjDtBKPVgcNHBhfaEm0QCQ7dbSf+2Q PEIXMRUFbDHXHUAddtshm3sNSShZWrZXPM/c4G15NHfNjRvdJoGaDPN4fV/PhTXHICZIVZfp6/8Y oXBQXzlbq+dFnjY5kCroy4vn2wOzTfG+Hmexn18aTGrKmkFEuHzsyczSmkOIiNzPqLx+CV/fXjkd Q9Iu+e051A01uODaqP2Uba24RwZYsowHFumfT0jIyQu9rS3SZu4Lauhhann0g9SsGdYaDdGfKT4W h86HVHCEoPA431DOUqyZt5HPgYymdFL2VsgdQjEogm6ycQV69al3ACNCafb/W/5tm0KuRoQ8Pqoz /UgopVeblDp1QN+3/1XBU1TeiSYb2S71VCtJUMgBTd90DzuX1IFaUsMDAHZdyXSEm9gh6D6Emlf4 NJUqy/jrKsVeUnQgUDsA7JTBg7ugOvT8NdjkCDGVHH0zn/v8TComSFBv62fjuM3UD360upwaOCpJ RjYX770Kxvjdd902kGhqR/wL3gtqif3J/AZHsIsaVQ7m7youlTsP84nle6/p3q4Uc+xoo4ucgaHv pJo/xPm+YbejEWEGkOetHHAa/aVGNSBc2Oj2NbtWHiZMNV8BZ9dcrALVhVPBJv From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 May 2023 22:07:49 +0800 X-OQ-MSGID: <20230522140749.33486-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: decrease probe score for a random tag 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ocee+VDOvH/H From: Zhao Zhili The tag comes from samples/ffmpeg/mov/unrecognized/bartjones.mov really looks like some random data. Now the random tag matched another file, which isn't a mov. --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9fdeef057e..285a4e99ca 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8107,6 +8107,8 @@ static int mov_probe(const AVProbeData *p) score = FFMAX(score, AVPROBE_SCORE_MAX - 5); break; case MKTAG(0x82,0x82,0x7f,0x7d): + score = FFMAX(score, AVPROBE_SCORE_EXTENSION - 5); + break; case MKTAG('s','k','i','p'): case MKTAG('u','u','i','d'): case MKTAG('p','r','f','l'):