This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new aab0c23cb8 lavc/j2kdec: Do not ignore colour association for packed
formats
aab0c23cb8 is described below
commit aab0c23cb848b9db10aae9849505221ba7988776
Author: Carl Eugen Hoyos <[email protected]>
AuthorDate: Sun Jan 4 23:50:53 2026 +0300
Commit: Marton Balint <[email protected]>
CommitDate: Sat Jan 24 20:25:05 2026 +0000
lavc/j2kdec: Do not ignore colour association for packed formats
Fixes ticket #9468.
Signed-off-by: Carl Eugen Hoyos <[email protected]
---
libavcodec/jpeg2000dec.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 276c0a6e43..e068ddaa82 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -2348,9 +2348,12 @@ static inline int tile_codeblocks(const
Jpeg2000DecoderContext *s, Jpeg2000Tile
int h = tile->comp[compno].coord[1][1] -
\
ff_jpeg2000_ceildiv(s->image_offset_y,
s->cdy[compno]); \
int plane = 0;
\
+ ptrdiff_t dstoffset = 0;
\
\
if (planar)
\
plane = s->cdef[compno] ? s->cdef[compno]-1 :
(s->ncomponents-1); \
+ else
\
+ dstoffset = s->cdef[compno] ? s->cdef[compno] - 1 : compno;
\
\
y = tile->comp[compno].coord[1][0] -
\
ff_jpeg2000_ceildiv(s->image_offset_y, s->cdy[compno]);
\
@@ -2360,7 +2363,7 @@ 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 + dstoffset;
\
\
if (codsty->transform == FF_DWT97) {
\
for (; x < w; x++) {
\
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
