This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 2065ead16e7c80adef9d46e3becb4b13ae62544a Author: Ramiro Polla <[email protected]> AuthorDate: Fri Feb 13 19:55:11 2026 +0100 Commit: Ramiro Polla <[email protected]> CommitDate: Tue May 26 11:19:14 2026 +0200 avcodec/mjpegdec: remove redundant vpred variable for bayer The vpred variable in ljpeg_decode_rgb_scan() is redundant with buffer[0][i], which is used by the generic codepath. --- libavcodec/mjpegdec.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f037d9f7aa..6e849ee80a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1093,7 +1093,6 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s) const int mask = ((1 << s->bits) - 1) << point_transform; int resync_mb_y = 0; int resync_mb_x = 0; - int vpred[6]; int ret; if (!s->bayer && s->nb_components < 3) @@ -1109,10 +1108,6 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s) return AVERROR_INVALIDDATA; } - - for (i = 0; i < 6; i++) - vpred[i] = 1 << (s->bits - 1); - if (s->bayer) width = s->mb_width / nb_components; /* Interleaved, width stored is the total so need to divide */ else @@ -1166,19 +1161,12 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s) topleft[i] = top[i]; top[i] = buffer[mb_x][i]; + PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); + ret = mjpeg_decode_dc(s, s->dc_index[i], &dc); if (ret < 0) return ret; - if (!s->bayer || mb_x) { - pred = left[i]; - } else { /* This path runs only for the first line in bayer images */ - vpred[i] += dc; - pred = vpred[i] - dc; - } - - PREDICT(pred, topleft[i], top[i], pred, modified_predictor); - left[i] = buffer[mb_x][i] = mask & (pred + (unsigned)(dc * (1 << point_transform))); } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
