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 5E22F4861E for ; Thu, 11 Jan 2024 13:16:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4AF968D028; Thu, 11 Jan 2024 15:16:56 +0200 (EET) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3872F68CDE1 for ; Thu, 11 Jan 2024 15:16:50 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 65BBA4000C for ; Thu, 11 Jan 2024 13:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1704979009; 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=qTY/IxdEEfLM7MbJyiGBkIAcMPqaLoA/n4Mzfc+iYgg=; b=KrbL2PkC7DvJF3YDxp11weLHFD8eEx5RnH9EZ1h9d+Edblyjx47gdlhdZUel6onyaiRlay zhdbFXMda9zQYSRreiTdwmLtMCpNfT9VelOgcl++e8bU8KT1qsmOHQegRv1UsMbCcJry0c UEnW2shGfQsXLV5su63mpC9Rw2sF8NRFpg4x6h6Ao0tlVVCf/3r6otssJ5o+oZoJBRPMYv eB64mhCcN1hLPr+3jFXu75oPKhrf2xJEofSEJU4LqF2+PVojbI/C58BP3jonkl1eRLGQWz t157ZxGgmlLjjWhptGggZ8td1UlBOHZXZT+bQXch6qDK2pMIOe4VuzGESAv3vQ== Date: Thu, 11 Jan 2024 14:16:48 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240111131648.GY6420@pb2> References: MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 3/4] avformat/psxstr: fix unknown sector type 00/80 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="===============9175783013351012686==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============9175783013351012686== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="p4lCLMlDzlgb3GqX" Content-Disposition: inline --p4lCLMlDzlgb3GqX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 02, 2024 at 02:57:18AM +0000, aybe aybe wrote: > This third patch fixes warnings that are false positives (still on STRv1). >=20 > That's because these sectors are simply empty ones as can be read in "Sys= tem Description CD-ROM XA, May 1991, > 4.3.2.3". >=20 > Haven't attempted significant refactoring as it just works, left a commen= t instead about the situation. >=20 > The result is that there are no more false warnings when converting. >=20 > Signed-off-by: aybe > --- > libavformat/psxstr.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c > index 72d14b9792..306a690f52 100644 > --- a/libavformat/psxstr.c > +++ b/libavformat/psxstr.c > @@ -48,6 +48,7 @@ > #define CDXA_TYPE_DATA 0x08 > #define CDXA_TYPE_AUDIO 0x04 > #define CDXA_TYPE_VIDEO 0x02 > +#define CDXA_TYPE_EMPTY 0x00 >=20 > #define STR_MAGIC (0x80010160) >=20 > @@ -274,6 +275,12 @@ static int str_read_packet(AVFormatContext *s, > str->channels[channel].audio_stream_index; > pkt->duration =3D 1; > return 0; > + case CDXA_TYPE_EMPTY: /* CD-ROM XA, May 1991, 4.3.2.3 */ > + { > + /* NOTE this also catches 0x80 (EOF bit) because of CDXA= _TYPE_MASK */ > + /* TODO consider refactoring so as to explicitly handle = each case? */ > + break; > + } will apply without unneeded {} thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you think the mosad wants you dead since a long time then you are either wrong or dead since a long time. --p4lCLMlDzlgb3GqX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iFwEABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZZ/qQAAKCRBhHseHBAsP q93vAJ4n1V27pE7aVLkFA4sMadbn9ZbL9QCYwjkrW0ShO0UCLVUPcOiNorejnw== =LAlJ -----END PGP SIGNATURE----- --p4lCLMlDzlgb3GqX-- --===============9175783013351012686== 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". --===============9175783013351012686==--