[FFmpeg-devel] [PATCH] Revert "avcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()" (PR #21309)

[FFmpeg-devel] [PATCH] Revert "avcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()" (PR #21309)

[Ramiro Polla via ffmpeg-devel]

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 <ramiro.polla@gmail.com>
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