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 4E9994D8BD for ; Wed, 3 Dec 2025 15:42:53 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'El1p9Kf69E3AeAkLGVYFwU6j9V8rXatQBAKZL/oqQbg=', expected b'2QVPx8d98YUL21zzwzTCIYSK5ExLTs+drlJvgqHDzrk=')) 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=1764776564; 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=El1p9Kf69E3AeAkLGVYFwU6j9V8rXatQBAKZL/oqQbg=; b=d8JZQS3mfo0IBimVLRiuPH2rh/q7iO29w5/OH5QDvNShIu7syaHcnis612rqfaUm6wnCP n4x4XWKVs8dz2o3nP/XgiC/YLsRUUDLHDf1hbyV8U6moxZtC3cb7Pwl+X7IZGxtKprnUJJc 1Ow53KZYiPSVZCFScchAMjJK7p9387b2Bzvh7OMFcDU6JYbh1WFMK61Qa47W/MKDpAtltIa wP4w/JYYGSCGVYy7CSHNDBR6RPbMnprNzhyrL/SF78W3seWAsl6ZxwwTJD44YTBMBKJxicl pyaHjvRy5RKF3KUyOrF3Q66+pOpU+b6ZBi/vXfE9BzMX0nKwn796DmVDzxgg== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EE5366904F0; Wed, 3 Dec 2025 17:42:44 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1764776555; b=rK8+VU7XlW0+nZ06dlRgT0lt2LUBe6ot1e8sw14qGLtMspfe6ypJa3ZaFuZkQ9zuKzbUc L0wF2U9lSWyomjjhGRxkzeW/W+P7iyd7opKtvvzDRSkYbOusGoo7MeDa+yx/0NvGJ0soktu PH4IayWJc+8UeTEAr5Wg2BQ018Hf9+KOdwujfWsL8n3H7rXowHcfByWjq+WO5r8F6jwOCOq FcBT+iPK+oayG+N6QtToaidzf9kSQ0TJe6s/v8fJhwDOF9W7oBNhcTXexxDqcJiCly3IvCd H8UQSaaBxuQQOJNLYlJfHfhXmGE+ic6xvXlFACDaDxUY46q8hi0N3mq7Pnsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1764776555; 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=tW2Lse2ck7eXFgsXudspp0qZUS9U6pVhDXLjCdIwYk0=; b=jyuVm0BiGf/iHXUQ7pKHtFE4aYzYHHKPeLqVTvfLtHgqZHFZo1SUvDjRFZn0ZWhKye/6F EXZpnlm/pjLQ2X9fOdhAwQqxDsgLxIkx1uKa71L9KqL+oYxhLZEONl7bILJ6HIWiBdBRNs6 qQGM7Ue00tjUnQpbK0BZ4i2HYYIGIR8KmHGf9AySjYBPJXRfrhsktvoPQ+zL1ZHm4BWSn0Q /ITiEX2HAFFCorbp04Np4r1dqRGHS5Q/u/9jbajTwcLcvGTUYS/WswHkMYo5WdzCg8txiqC o7rV7UGilFlvyBAOyZOk5VdNDqWV6ldsTiU42gur2tHF2F46GcyV1pBiSLaQ== 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=1764776546; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=2QVPx8d98YUL21zzwzTCIYSK5ExLTs+drlJvgqHDzrk=; b=QsySh932v/4+X83I6kJ+Yok3yvID2O1j9PS/E1x6n41ZjmmIluxIwFJHU6u93T7hcHipr MMKmanHnd6JYzPby3L1P6x9/mr1PV7Zo+gnvRtO3rFBMIqbFXAYSoDiDlgCkk32SlgVTbqe oQ/0KvkTttGeaVKufOA+PbyRHBhz+UIM+bVhBpcr++kLPRU6dTCaY+MN8XvfoVa1BVnem8G ntbG5h0cgt5Waaok22Ro7iHcIztLPIOc22JcKjVnIqwW+N84/Z4WG8mepD62I7amvenEYEx KjVTNkrNGZ5BzxLQerEhdaWXIkXW/Llj+0t87pxFhNnxlgU177U2vJLvrr4A== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 758B9690477 for ; Wed, 3 Dec 2025 17:42:26 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 03 Dec 2025 15:42:26 -0000 Message-ID: <176477654665.39.11216413723596474481@2cb04c0e5124> Message-ID-Hash: 22BQFRL74WJ4LJCMK5ZEC4TEFEXFK4RT X-Message-ID-Hash: 22BQFRL74WJ4LJCMK5ZEC4TEFEXFK4RT 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] lavc/j2kdec: Do not ignore colour association for packed formats (PR #21092) 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: Valerii Zapodovnikov via ffmpeg-devel Cc: Valerii Zapodovnikov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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