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 0A42C4786E for ; Fri, 24 May 2024 20:52:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4840D68D55F; Fri, 24 May 2024 23:52:10 +0300 (EEST) 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 E83F568D420 for ; Fri, 24 May 2024 23:52:03 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0C54AE0003 for ; Fri, 24 May 2024 20:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716583923; 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=AUTmw6gL2X7hvKjQXj2eCqdkwBLnl20DYEyJMSKFL4k=; b=oRJ3TjGPx4k3QT5o7YDpE02iO3rxsErRb1WB5v7+HRxxWsoQ8Pd1KmyZim00viRC7sC65n nwp+e7hCXM808DvgNBsClV6FGvNzD7R90ahl0TXJmwIUdPcrKyyPcmeguZVn93mFLlLcCX yNZuucqH0C4KDbzmT26hw37vX7rir8q/Fz8NwJ4EpGZH9YTmNYe3J5FX9ZYIJ48tbXH7pl 1t/l1kwJZG3+ASvBAaDKVBFKmBj6s4uw9Q6dIm9SrrGGT02jMuEl3uRLfDEfI/auK16UkS 3cxplfAQ+K44oqH6Wb8MvxChUv9NJSly3le52DvSE5DO+RRkBxmTk72L0bFh3Q== Date: Fri, 24 May 2024 22:52:02 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240524205202.GA2821752@pb2> References: <20240524002523.2984524-1-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: 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="===============3285984000179386023==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============3285984000179386023== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IFrzt5yFNjsAZ17G" Content-Disposition: inline --IFrzt5yFNjsAZ17G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 'analyzedura= tion' (%"PRId64") and 'probesize' (%"PRId64") options\n", > > i, buf, errmsg, ic->max_analyze_duration, ic->probe= size); > > - } else { > > - ret =3D 0; > > } > > } > > =20 >=20 > IIRC these stores are only dead since > ac5a568e6dff8162a2e982f3571b925f1b207e2c; and it doesn't seem as if this > was intended. replaced by: @@ -3027,9 +3027,11 @@ int avformat_find_stream_info(AVFormatContext *ic, A= VDictionary **options) } } - 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; + } /* update the stream parameters from the internal codec contexts */ for (unsigned i =3D 0; i < ic->nb_streams; i++) { [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin --IFrzt5yFNjsAZ17G Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZlD96wAKCRBhHseHBAsP q9ERAJ46y7KdlyDGI11gHJ9mPzE/VA6rqACfU1Kzd/Wu2zRbF7L6zCDb0BulKq8= =V1in -----END PGP SIGNATURE----- --IFrzt5yFNjsAZ17G-- --===============3285984000179386023== 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". --===============3285984000179386023==--