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 521BB48C6A for ; Tue, 23 Jan 2024 20:04:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B0E968D001; Tue, 23 Jan 2024 22:04:50 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEA0468BD38 for ; Tue, 23 Jan 2024 22:04:43 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 12DC8E0006 for ; Tue, 23 Jan 2024 20:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1706040283; 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=J0qaN0VukShIOTBTbafOq49QLorbyrinvGkcRn1ZWhs=; b=AakVdfCrzZCoEkLNUIqPP+ZxF7ESaincQm0R9dI6nMFP4EwkzjN4cPy20x82TFWSGm8AEc MiYpN/ko7cq9tQTlZDBWG1zY/ynSFvbVCyKB4ARHyw066ehC4mRxi6sHFetPV2Dq5xadMf WbmbgFDW5ImaQ17oyEPnCD2n7ct9ab8U7q6JEml39XI4Y0mrRQpvdcOmYAJOlchZeRQo8I EHzoAvhuiFHuj9Zra4TlV7pCDQtgR5Jg4a1EB+DRFCJdkF6udh5alrOrLT2msau6xkdZWK AQIMaT2J19d/AYfB7hwSWopwm48Ka1i+xUKHWOsUdIXAEsYghalRak+UbxjE+g== Date: Tue, 23 Jan 2024 21:04:42 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240123200442.GD6420@pb2> References: <20240123014733.30675-1-michael@niedermayer.cc> <60524b84579ab30dcb8e4d11402f56b417295506.camel@haerdin.se> MIME-Version: 1.0 In-Reply-To: <60524b84579ab30dcb8e4d11402f56b417295506.camel@haerdin.se> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] =?iso-8859-1?q?=5BPATCH=5D_avformat/mxfenc=3A_Rem?= =?iso-8859-1?q?ove_AVERROR=B2?= 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="===============0053605917842654560==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0053605917842654560== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U91QO+XiG1lS8R5H" Content-Disposition: inline --U91QO+XiG1lS8R5H Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 23, 2024 at 01:56:29PM +0100, Tomas H=E4rdin wrote: > tis 2024-01-23 klockan 02:47 +0100 skrev Michael Niedermayer: > > Signed-off-by: Michael Niedermayer > > --- > > =A0libavformat/mxfenc.c | 6 +++--- > > =A01 file changed, 3 insertions(+), 3 deletions(-) > >=20 > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > > index 685c11b3a50..c67e8ff9609 100644 > > --- a/libavformat/mxfenc.c > > +++ b/libavformat/mxfenc.c > > @@ -2656,13 +2656,13 @@ static int > > mxf_parse_jpeg2000_frame(AVFormatContext *s, AVStream *st, AVPacket * > > =A0 > > =A0=A0=A0=A0 if (bytestream2_get_be16u(&g) !=3D JPEG2000_SOC) { > > =A0=A0=A0=A0=A0=A0=A0=A0 av_log(s, AV_LOG_ERROR, "Mandatory SOC marker = is not > > present\n"); > > -=A0=A0=A0=A0=A0=A0=A0 return AVERROR(AVERROR_INVALIDDATA); > > +=A0=A0=A0=A0=A0=A0=A0 return AVERROR_INVALIDDATA; > > =A0=A0=A0=A0 } > > =A0 > > =A0=A0=A0=A0 /* Extract usefull size information from the SIZ marker */ > > =A0=A0=A0=A0 if (bytestream2_get_be16u(&g) !=3D JPEG2000_SIZ) { > > =A0=A0=A0=A0=A0=A0=A0=A0 av_log(s, AV_LOG_ERROR, "Mandatory SIZ marker = is not > > present\n"); > > -=A0=A0=A0=A0=A0=A0=A0 return AVERROR(AVERROR_INVALIDDATA); > > +=A0=A0=A0=A0=A0=A0=A0 return AVERROR_INVALIDDATA; > > =A0=A0=A0=A0 } > > =A0=A0=A0=A0 bytestream2_skip(&g, 2); // Skip Lsiz > > =A0=A0=A0=A0 sc->j2k_info.j2k_cap =3D bytestream2_get_be16u(&g); > > @@ -2677,7 +2677,7 @@ static int > > mxf_parse_jpeg2000_frame(AVFormatContext *s, AVStream *st, AVPacket * > > =A0=A0=A0=A0 j2k_ncomponents =3D bytestream2_get_be16u(&g); > > =A0=A0=A0=A0 if (j2k_ncomponents !=3D component_count) { > > =A0=A0=A0=A0=A0=A0=A0=A0 av_log(s, AV_LOG_ERROR, "Incoherence about com= ponents image > > number.\n"); > > -=A0=A0=A0=A0=A0=A0=A0 return AVERROR(AVERROR_INVALIDDATA); > > +=A0=A0=A0=A0=A0=A0=A0 return AVERROR_INVALIDDATA; > > =A0=A0=A0=A0 } > > =A0=A0=A0=A0 bytestream2_get_bufferu(&g, sc->j2k_info.j2k_comp_desc, 3 * > > j2k_ncomponents); > > =A0 >=20 > OK of course will apply thx to both reviewers [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Freedom in capitalist society always remains about the same as it was in ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin --U91QO+XiG1lS8R5H Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZbAb0wAKCRBhHseHBAsP q+eUAJ99KnLyOesz7X/rbavQR5Zv9wPrzwCfV83dSXq+7DFY2JBodWxxi7+Lv4Y= =7ryu -----END PGP SIGNATURE----- --U91QO+XiG1lS8R5H-- --===============0053605917842654560== 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". --===============0053605917842654560==--