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 5004A48AA9 for ; Mon, 27 May 2024 23:38:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01F7568D4E5; Tue, 28 May 2024 02:38:14 +0300 (EEST) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F279168D3C5 for ; Tue, 28 May 2024 02:38:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 45452FF802 for ; Mon, 27 May 2024 23:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716853086; 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=jjDrIOjZdIwyMSAqhtvgDSO3LQ7toTcQLUz2tnDy+1s=; b=JVC7FW5/OyBRgNn1Dy7xP6ag7C5mr/JF7S2kqtxStU8IfkPvMe0Ktf7NUy5wWAYxlx/Qd4 bas+4Xbxy9eSbnGU41Z3MRBNVQKje6qJq+FJWUn5yRYdw0KnlbZ3owuVXUQdm4O3gUQLV8 uxeM6ebSFe8NZpuP7wimMDv6epjHj+Q4dAUU+bW/ASIlBwfo0Px4SSbj2QdKqZ2mGF+Y+j bmzUcIyrHYq/f21nFe8pwlBJT8CIxx8X12OqNUqj+SQn1TVtRB+QQYnoDkyQix5qe9cx13 oOe5u8nJ6AIdAaQgtYqEb4MKdMiJgfdZOsg0hUjLyXEJGa3L6i/VvtWcdKdvgg== Date: Tue, 28 May 2024 01:38:05 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240527233805.GS2821752@pb2> References: <20240524002523.2984524-1-michael@niedermayer.cc> <20240524205202.GA2821752@pb2> MIME-Version: 1.0 In-Reply-To: <20240524205202.GA2821752@pb2> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] avformat/demux: Remove dead stores 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="===============5511902636054391605==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5511902636054391605== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NZ00oluAJr3A0NMv" Content-Disposition: inline --NZ00oluAJr3A0NMv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 24, 2024 at 10:52:02PM +0200, Michael Niedermayer wrote: > On Fri, May 24, 2024 at 08:21:05AM +0200, Andreas Rheinhardt wrote: > > Michael Niedermayer: > > > Fixes: CID1473512 Unused value > > > Fixes: CID1529228 Unused value > > >=20 > > > Sponsored-by: Sovereign Tech Fund > > > Signed-off-by: Michael Niedermayer > > > --- > > > libavformat/demux.c | 5 ----- > > > 1 file changed, 5 deletions(-) > > >=20 > > > diff --git a/libavformat/demux.c b/libavformat/demux.c > > > index ecefe7e0a74..d0a5a39d052 100644 > > > --- a/libavformat/demux.c > > > +++ b/libavformat/demux.c > > > @@ -2998,9 +2998,6 @@ int avformat_find_stream_info(AVFormatContext *= ic, AVDictionary **options) > > > =20 > > > av_opt_set_int(ic, "skip_clear", 0, AV_OPT_SEARCH_CHILDREN); > > > =20 > > > - if (ret >=3D 0 && ic->nb_streams) > > > - /* We could not have all the codec parameters before EOF. */ > > > - ret =3D -1; > > > for (unsigned i =3D 0; i < ic->nb_streams; i++) { > > > AVStream *const st =3D ic->streams[i]; > > > FFStream *const sti =3D ffstream(st); > > > @@ -3022,8 +3019,6 @@ int avformat_find_stream_info(AVFormatContext *= ic, AVDictionary **options) > > > "Could not find codec parameters for stream %d (%= s): %s\n" > > > "Consider increasing the value for the 'analyzedu= ration' (%"PRId64") and 'probesize' (%"PRId64") options\n", > > > i, buf, errmsg, ic->max_analyze_duration, ic->pro= besize); > > > - } else { > > > - ret =3D 0; > > > } > > > } > > > =20 > >=20 > > IIRC these stores are only dead since > > ac5a568e6dff8162a2e982f3571b925f1b207e2c; and it doesn't seem as if this > > was intended. >=20 > replaced by: >=20 > @@ -3027,9 +3027,11 @@ int avformat_find_stream_info(AVFormatContext *ic,= AVDictionary **options) > } > } >=20 > - ret =3D compute_chapters_end(ic); > - if (ret < 0) > + err =3D compute_chapters_end(ic); > + if (err < 0) { > + ret =3D err; > goto find_stream_info_err; > + } >=20 > /* update the stream parameters from the internal codec contexts */ > for (unsigned i =3D 0; i < ic->nb_streams; i++) { >=20 will apply this modified variant thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "Nothing to hide" only works if the folks in power share the values of you and everyone you know entirely and always will -- Tom Scott --NZ00oluAJr3A0NMv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZlUZUwAKCRBhHseHBAsP qyYQAJ90p7sIAyVJVGhiH9VjSfADvfATJgCfSAzZp5OR235N+J8XSvuNE/8rdEM= =ArMd -----END PGP SIGNATURE----- --NZ00oluAJr3A0NMv-- --===============5511902636054391605== 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". --===============5511902636054391605==--