From patchwork Tue Jan 25 07:26:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 33836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp386223iov; Mon, 24 Jan 2022 23:26:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxsOzhEHcf0y7x7bCBiTT1uqgRfzXVvbFRBOfBwZKrspCoEVykcxAf+qh2yURlMDqNMA0T X-Received: by 2002:a05:6402:185:: with SMTP id r5mr19077270edv.259.1643095608611; Mon, 24 Jan 2022 23:26:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643095608; cv=none; d=google.com; s=arc-20160816; b=WLh7DmAvOKoy/7KKRCyOJKiVV7ihe2fsKflg/5SeT6elNRAJ3fzjbdYZ/HDyDZjcGB u7AhvSvW+Mugx0hvBad2wUwQaUlBW7kBWOgLfUR55yA5CVf+9RtVbwnMRbB6x2A0aqXJ IXXaH1tJ523Z7SRH6fBHyExFZL5VujRExA5WtBy7OlZ79RvdsqlwmTOS8wPCX9QObe7w Z3jC49PDFL4koi0Mufi/dynnQIMswpYL3+3gLycBoEO2NS2Q8PTPgLYbCqhsLQPllqcZ wDpHFihcVeEu7WQimO96gV+94lAOGABOeQp0nUtZUL7918Uxnq5OyP2x+NgW27I+YVmh J/Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=0OMIftM4NnNyXcH62srmxPECp/wwAC1XlEpGpQEGuXQ=; b=eHRGJDAdYJPfsF/GOYsUnPwBY2zK07AtzJ5mlzvHrPT/TunAR5p++pvvFe4gigs5pv MpL3PlzLmLiJXYo+uUfoEJFme8qrYSBZkeQ0fdu5DbzVM6BhHSRWE5oXcCs+NFjcBpG4 nEA1M1fsnmg3E5cmzoicKCGEWkw1yz10SAmOuEDbt8SkgZOaHITWC3Qg9U8DoAWlBqLk WklN/mjtxkHRPfi+IGSE3os/UXgeUgkd/55AvdA8K2j7jzijttncX1DDxEEIo63r3Bvw Uc6JVVB0QEpR0BcAH46hzPyFRXkXixkc6WYsvPRI/M4o/lAb5MmlaJEqYZXE0G2P7aCr TOZA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t24si6377952eds.484.2022.01.24.23.26.48; Mon, 24 Jan 2022 23:26:48 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B87A68B0F9; Tue, 25 Jan 2022 09:26:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFA8068AF45 for ; Tue, 25 Jan 2022 09:26:38 +0200 (EET) Received: from ea2f9051f9c337d4d13ad945a7d0ee7f ([1.152.188.127]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 20P7QRNI029852 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Tue, 25 Jan 2022 07:26:32 GMT Date: Tue, 25 Jan 2022 18:26:23 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <9d94d5b772e7580d49a5fd084f38ec07feed8571.1643091105.git.pross@xvid.org> References: MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 14XMdQnGxWyr Signed-off-by: Peter Ross --- libavformat/img2dec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 2583ca2465..8608252d83 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1112,7 +1112,6 @@ static int photocd_probe(const AVProbeData *p) static int gem_probe(const AVProbeData *p) { const uint8_t *b = p->buf; - int ret = 0; if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 && AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 && (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */ @@ -1121,13 +1120,13 @@ static int gem_probe(const AVProbeData *p) AV_RB16(b + 10) && AV_RB16(b + 12) && AV_RB16(b + 14)) { - ret = AVPROBE_SCORE_EXTENSION / 4; if (AV_RN32(b + 16) == AV_RN32("STTT") || AV_RN32(b + 16) == AV_RN32("TIMG") || AV_RN32(b + 16) == AV_RN32("XIMG")) - ret += 1; + return AVPROBE_SCORE_EXTENSION + 1; + return AVPROBE_SCORE_EXTENSION / 4; } - return ret; + return 0; } #define IMAGEAUTO_DEMUXER_0(imgname, codecid)