From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id DDE784E4AF for ; Fri, 23 Jan 2026 10:40:36 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'GLdq3W5IL/Oimy1KoXJskmhVqzpz5TW2tq2d7t4yqIs=', expected b'+6OXvO+g/2VGGrzpcWj5aZmLcgVCQBZIowzxcyTvNEY=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1769164828; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=GLdq3W5IL/Oimy1KoXJskmhVqzpz5TW2tq2d7t4yqIs=; b=LPQTnDNkZ2QW8vxRP4fdt+K3WxeZA5bDKPD8gJu2R476a6LY+K0TembCQzteEAKQ1UDix eh0UFOEY2nX7WzrCjJe93lxq6cG0omBzY62nuv6cgOUa1XyYfTknmkQKPJtZrwCmjmBEdhk mY/i/75+qI/vGYX23u/90xqqHf4/PX+EVTLAKHsXguUp/0pKha7DgyjYdZ/cVITfX2uheQC 7kAWWRUfzb0hsanyqoByl8VSroYB9wSnuAgdGz6J4WQYSHY1oBrU7BolJ3OyMzZviHDX0k7 htsqG8rp6uRlhjJBZPI9/pvnjSmtqB49E2XzNcCvnzU1S7pO4XWOtaBmPENw== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 449CF691425; Fri, 23 Jan 2026 12:40:28 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1769164812; b=e0QEffTWGdNplp+Oq0AxZVCspx0idCfSuhtzPULdKoSzjvYPABfHc6KhOUqzUO/H81iP6 2ZYt4FyUIvtwAWMh4OxcXlPQrg/AFklX98GnBH589UsFuHxFhUnO0XGsktlj9fFBmqEjpBK /FLmw/LLLZFfBd+n53yZtNj+vwn5iTWsu1EOEB+RSdzXul/boYSZVEIG7KdR9SWBX42mj0e 0rYG4E6f3lO1MAPzF1ot1P2jTgp8Wf9H3MM+YWCFCeuxiYYX2RgHbsDXazIK+eQJUHTo6ZI tLMSJZ+DQbWEstcjpAcekNxJKEYh1/8in6wloMaoKXYBBC8gDPAwI+V4R/eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1769164812; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=OfrP0N7yOZDWM8Ej4Krq8PZZJdei7GL/SbTtGnHs/+M=; b=kCj00EqkQUinbwP9pfsT9iC6bNTqP9u9CvG+wAhFvKW+30H2snFRLMJOTtgD2qEX/ubvY NjcHQD7wG87bu4gY9/n07Z0q+9OdRMT15XgRA0qREXQizxe7GKALYeY7ogrmbzt0h48rRD9 07Cs9v6BAGi3zebOaqHQgRGS4c8bPCLsR7BtmDsgtBlnIQgMxZyGHTVE5j8qG/sn/dQ0rVW pVoKuX8aC6ClE3yBEdgLFPztTVSgQsjUbrq5G/TLkGP2C3MCY15nuiLmQOrXCpkKu6c1jmU qKPK6MLpU20zkj/etYMLcK+PAx4svvh6yIkiKZNxfKzZVK9T6Nx4f0Vvd2OA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1769164802; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=+6OXvO+g/2VGGrzpcWj5aZmLcgVCQBZIowzxcyTvNEY=; b=JG+/3PolQOK9DTSPFWKYkDlvZPx56sDL7onH+/hSDYIiKTzudusiz4sEwedQVZkZ7++57 eQfHVc1WFtseYp5fR7HHpplWcF1rlJvkzRCmfQ8XBY34I+5VDf3O/LBnMUUMi4sY63m6Vw4 x8Yd0DI7zqu6PkOdHFuD10KsDTAHxa5qCkoCHEsHVGGaQFBRexJKqxtiG5V5joXaPpNK0o8 VoPOPvRyG12MXAD0XnZwRDbNVyV/pFlk+y+Jzk5Uqp3d0kFnGBvNhYAjpdn2q39lJcOG6VU dY99tNuazvnX6sW1bKEBxBzPS3S3Tsw42AOJVEt5TEmvuILaIqIiDkFq5ACA== Received: from 69dab402ede7 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CF9B2691394 for ; Fri, 23 Jan 2026 12:40:02 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jan 2026 10:40:02 -0000 Message-ID: <176916480302.25.8867835530478004321@4457048688e7> Message-ID-Hash: ZG3IAJCCGTIVNVLGFKWFHLJWUPPQE7JZ X-Message-ID-Hash: ZG3IAJCCGTIVNVLGFKWFHLJWUPPQE7JZ X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] lavf/mp3dec: remove ID3v2 check in mp3_read_probe (PR #21557) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jun Zhao via ffmpeg-devel Cc: Jun Zhao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21557 opened by Jun Zhao (mypopydev) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21557 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21557.patch Since 33dd3485ba (lavf/format: skip multiple consecutive ID3v2 tags in probe), av_probe_input_format3() skips all ID3v2 tags before calling format probes, so mp3_read_probe() will never see ID3v2 data at the start of the buffer. This makes the ff_id3v2_match check dead code. Additionally, the original logic of returning a low score when only ID3v2 tags were visible was questionable - format.c already handles this case properly by using file extension matching with appropriate scores when ID3 tags consume the probe buffer. Signed-off-by: Jun Zhao >>From 8d5c9f38d8df0ac9575b3c570ec47e39d20f8234 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Fri, 23 Jan 2026 16:10:20 +0800 Subject: [PATCH] lavf/mp3dec: remove ID3v2 check in mp3_read_probe Since 33dd3485ba (lavf/format: skip multiple consecutive ID3v2 tags in probe), av_probe_input_format3() skips all ID3v2 tags before calling format probes, so mp3_read_probe() will never see ID3v2 data at the start of the buffer. This makes the ff_id3v2_match check dead code. Additionally, the original logic of returning a low score when only ID3v2 tags were visible was questionable - format.c already handles this case properly by using file extension matching with appropriate scores when ID3 tags consume the probe buffer. Signed-off-by: Jun Zhao --- libavformat/mp3dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 5b153c7c9e..912e5da502 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -122,8 +122,6 @@ static int mp3_read_probe(const AVProbeData *p) if (first_frames>=7) return AVPROBE_SCORE_EXTENSION + 1; else if (max_frames>200 && p->buf_size < 2*max_framesizes)return AVPROBE_SCORE_EXTENSION; else if (max_frames>=4 && p->buf_size < 2*max_framesizes) return AVPROBE_SCORE_EXTENSION / 2; - else if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size) - return p->buf_size < PROBE_BUF_MAX ? AVPROBE_SCORE_EXTENSION / 4 : AVPROBE_SCORE_EXTENSION - 2; else if (first_frames > 1 && whole_used) return 5; else if (max_frames>=1 && p->buf_size < 10*max_framesizes) return 1; else return 0; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org