[FFmpeg-devel] [PATCH] lavc/j2kdec: Do not ignore colour association for packed formats (PR #21092)

[Valerii Zapodovnikov via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #21092 opened by Valerii Zapodovnikov (Balling)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21092
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21092.patch

Fixes ticket #9468.


Easy to see of you 

ffplay https://trac.ffmpeg.org/raw-attachment/ticket/9468/dg2img-3f096fe9d00296bc3734ac4f01b5bf60.j2k


>From 2f802a6b6463066aea6a7514bac9a4e5231542a6 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Wed, 3 Dec 2025 18:39:12 +0300
Subject: [PATCH] lavc/j2kdec: Do not ignore colour association for packed
 formats

Fixes ticket #9468.
---
 libavcodec/jpeg2000dec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index de1a73b92b..203b0f6cb7 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -2360,7 +2360,8 @@ static inline int tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile
                                                                                                   \
                 x   = tile->comp[compno].coord[0][0] -                                            \
                       ff_jpeg2000_ceildiv(s->image_offset_x, s->cdx[compno]);                     \
-                dst = line + x * pixelsize + compno*!planar;                                      \
+                dst = line + x * pixelsize +                                                      \
+                      (s->cdef[compno] ? s->cdef[compno] - 1 : compno) * !planar;                 \
                                                                                                   \
                 if (codsty->transform == FF_DWT97) {                                              \
                     for (; x < w; x++) {                                                          \
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org