From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 919654AC86 for ; Sat, 18 May 2024 19:24:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20B4A68CC90; Sat, 18 May 2024 22:24:23 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F4E568BF41 for ; Sat, 18 May 2024 22:24:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id CABC420003 for ; Sat, 18 May 2024 19:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716060256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ADDln6Ocqw/2Xw65spkmKR4WBM9z+C5vmPuzEvUe7eI=; b=h4KINxtbH7PKvKD1VgAwToT9jt5G1PJmoa3vExHa/0aAEVk2XxzsIPo4K+N2ISfYLlANMa VTnnmYgOaJ3ynp2GGX4H20x0DjaajBxacgj84/uXNEd8jvu7f/yWat+cBbSqoE3rd8tA1J AzML+tu4eciGnyX2XYUtNSuanl7jNhJmmpQOPkjxxYVHFjmATir7lYY1wg+Tok0dOCDSv+ Fd/Q0NaspKc7c2FJcauG789clgCyqdkIgfxpuCkVn2wq7cpdUhVsW4Rf9Q3yeqO4v7qG96 CtlFmUe1GHP29lQ435DE9wn3mtaItBA7bg+mtuD5JGzaIoo/vGnfJ/C+ZuUzJA== Date: Sat, 18 May 2024 21:24:14 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240518192414.GA2821752@pb2> References: MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: fix HT block decoder issue #10905 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============1597467949689399509==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============1597467949689399509== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DocE+STaALJfprDB" Content-Disposition: inline --DocE+STaALJfprDB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 17, 2024 at 08:00:16PM +0000, WATANABE Osamu wrote: > Signed-off-by: Pierre-Anthony Lemieux > --- > libavcodec/jpeg2000htdec.c | 122 ++++++++++++----------- > tests/ref/fate/jpeg2000dec-ds0_ht_01_b11 | 2 +- > 2 files changed, 63 insertions(+), 61 deletions(-) >=20 > diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c > index fa704b665e..62f70c32a8 100644 > --- a/libavcodec/jpeg2000htdec.c > +++ b/libavcodec/jpeg2000htdec.c > @@ -196,7 +196,7 @@ static void jpeg2000_bitbuf_refill_forward(StateVars = *buffer, const uint8_t *arr > while (buffer->bits_left < 32) { > buffer->tmp =3D 0xFF; > buffer->bits =3D (buffer->last =3D=3D 0xFF) ? 7 : 8; > - if (buffer->pos <=3D length) { > + if (buffer->pos < length) { > buffer->tmp =3D array[buffer->pos]; > buffer->pos +=3D 1; > buffer->last =3D buffer->tmp; > @@ -508,17 +508,17 @@ static int jpeg2000_decode_sig_emb(const Jpeg2000De= coderContext *s, MelDecoderSt > } >=20 > av_always_inline > -static int jpeg2000_get_state(int x1, int x2, int width, int shift_by, > +static int jpeg2000_get_state(int x1, int x2, int stride, int shift_by, the first whitespace seems to have been lost this makes git reject the patch Applying: avcodec/jpeg2000dec: fix HT block decoder issue #10905 error: corrupt patch at line 20 error: could not build fake ancestor thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What does censorship reveal? It reveals fear. -- Julian Assange --DocE+STaALJfprDB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZkkAVQAKCRBhHseHBAsP q1+xAJsFsANuBVWsY7YcJXDVUUx9O6onYgCglsEWwuVhl8HKC5O1ScXQ8ESDm8E= =TrpP -----END PGP SIGNATURE----- --DocE+STaALJfprDB-- --===============1597467949689399509== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============1597467949689399509==--