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 BE5A14BAF0 for ; Mon, 29 Dec 2025 14:13:46 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'FiA05vmGnFSAIh0cR7M34kmvv9TlFk1pheGiJutep10=', expected b'+lql2nvJD+DIt26hXPTEylOu3IksoZXJXs7HjOFtIK0=')) 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=1767017617; 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=FiA05vmGnFSAIh0cR7M34kmvv9TlFk1pheGiJutep10=; b=tJBANQfKBzMiKgyk8qles8J2YjIoe7LezBgKgwnYYBK3+nq/rIYcjTf9Tl1r6f6OiQwPR 0QDXkPClmGGk0b0PQoRUPYyPJLgLUUWHIICu2m06YvKSBcfzrdxVLktQeGKteWBd/eZOmg4 b5J+7K6F2CKjp+ChSceYv9D3X0AOA91S0mIZrH2GOeOjU9yJSoqi5+lUeigjkCKqsWoTiJv 4DnkHOa2nP/BpPdAaCGgF2EF0mOOA8S7duePgKszI7P62Z0Ib9rY/qNIRfCdhQ89CWWVChS MZGdCo93/7D4sebi+XiBtSMKh0OkKvcjtw5977JBR6ZQqOlOkFw3UMExTT3w== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EC78C690C92; Mon, 29 Dec 2025 16:13:37 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767017600; b=VpQaBq8amfVRNm5eZhKoPvrCweWCqaw5UTgpCaAOhprXAKz0UWfKahAh2n53PdauTyKJO ky9bHCgq67R/WExhOV4Onh9uMBZMlisumDOFTeuoyHfKIBGqAnZJmKpk6fzBd20cn13wUjT E9yMuam1w5zt3/IyUaZ8rVv62bLhRZO0QZPVuLODvsh8Kls9aACTG1hwPoqCk91bz25L8wN onmoj/ZWJWSMpI5rTGvwQSgSJpx0hflmduF0hrNRTKnHCQ7TE0khLWGHSiJBU/A8lMOFyLW tIl4e8g8nPBlj8iS7vC6APgjeUe8Pnrt5cMJikw1Ew6njTMnhZZb7SIMmUyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767017600; 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=+E6ylYyFoRvDaq/KfFUeC41W4jgj8QrRoBWAuhQ9i98=; b=TuzegyekTeXAL5WGwp659AUOtKnk6iqNQ4BUT+twtqcyHJ3mzUfPjR4tci9NVMOoS87BN lXWJJgG2EycRxuUFHJJyLGuOA2UHaytuJEt0Vu1JvPt8+J8wddTgvP+87OUTRojbvzJ+WKb acRvhup6MVasOB2Z/LkbytqKJ7PmGU3gEsUxFYubMwdmEni+CdSP3OG8LPzUlkLw5W6N6tO qPDznQP9SiIFX/uvzDo6pCAApSFk3yu6FtOMwv1ldSWCTgC2rBQ5d5sG6ZKWZDju4F+aKk3 1s55rnSBUjq/sJpaIb6+WDBBEUGFgHJtASpkj9aY1jPPFd2HJT49zufAwyFg== 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=1767017592; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=+lql2nvJD+DIt26hXPTEylOu3IksoZXJXs7HjOFtIK0=; b=cR5h7H/qnGtV8f9IyMw1h6znOSy1KCrmQyyZBqcHivycyPN7/ncelPEglRaqcQEqrPVk2 HsJdOopf8aAllqia4u/Q2NtordlPw5FJvdaKcuc2mOGyMqABWFpUvkDqEd1YorZXfDc0cXS zkemygfqnwzFFU+K38zJXd9O5iqw+jFMgQe9eIAoN018q9kH3Oc27xNXIH/cWi16WtOs6CZ 7z0n2teXMaZRIv9MOaGnTIjkBmFcc9/hKq+ekTtrXs8Cx/lbazAQ4QjRwZ2BqhMG1vi6kJF W1mWVk1kn+d+/vkjqo24u3OhCZt/csa0kvuVwO19blMI1/+FPfzCBvkVkANw== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A7591690C03 for ; Mon, 29 Dec 2025 16:13:12 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Dec 2025 14:13:12 -0000 Message-ID: <176701759287.25.15347388141224826714@4457048688e7> Message-ID-Hash: TTSYGFRTNEB7AMIQC5L6T22JBXZG2ZY6 X-Message-ID-Hash: TTSYGFRTNEB7AMIQC5L6T22JBXZG2ZY6 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] [PATCH] Revert "avcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()" (PR #21309) 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: Ramiro Polla via ffmpeg-devel Cc: Ramiro Polla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21309 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21309 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21309.patch This commit has been made redundant by 909faca929c, which is run more often (once per mb instead of once per line). This reverts commit 3782656631fa8262528c07794acf7e9c2aab000d. >>From 336881ca3f8fa1ec9d09d8840ef7fa4514884b76 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Mon, 29 Dec 2025 15:09:02 +0100 Subject: [PATCH] Revert "avcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()" This commit has been made redundant by 909faca929c, which is run more often (once per mb instead of once per line). This reverts commit 3782656631fa8262528c07794acf7e9c2aab000d. --- libavcodec/mjpegdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 05150e982c..7a30ea2af5 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1600,10 +1600,6 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, int block_idx = mb_y * s->block_stride[c]; int16_t (*block)[64] = &s->blocks[c][block_idx]; uint8_t *last_nnz = &s->last_nnz[c][block_idx]; - if (get_bits_left(&s->gb) <= 0) { - av_log(s->avctx, AV_LOG_ERROR, "bitstream truncated in mjpeg_decode_scan_progressive_ac\n"); - return AVERROR_INVALIDDATA; - } for (mb_x = 0; mb_x < s->mb_width; mb_x++, block++, last_nnz++) { int ret; if (s->restart_interval && !s->restart_count) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org