From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 31F784CFAE for ; Tue, 12 Aug 2025 14:48:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1FB0468C4C1; Tue, 12 Aug 2025 17:48:08 +0300 (EEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5101068B760 for ; Tue, 12 Aug 2025 17:48:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A7BF544439 for ; Tue, 12 Aug 2025 14:48:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1755010080; 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=gSTS4Bc6R1/Ts0V5t3MbF6E9p9yHRF0lIHds3yCA8wY=; b=Dc/LZWbFJQEonc7sL9XB2CAdJPFzdJeXLocBtS5XGt7j95KEfTwnGJ42WjnjlBM+/sj6Y/ JPn0cQ1YM7VoYOHfb+ymuK0JgpxzSkF0YBv4uZxtFsNobDqS2U5wW3bAcmgllMwhY17G3b LmCsKxnQSQjJQ04ICccSyLsssdnRj4hS6+gwNpB932/RtsGUQCucboXw9knujiMZsSMYee MKsnrlqO4xrn9dRKrPRQRQFjASvIcR7YN4oVwVLFn8UYU0YUlN5U/bP8vGC1k+osgl5+j1 lSAqpSI4DcnkZI9P394N3nP29GfAW7dY3UR4CEkqk9JrQD44zOP4SvdX8mJVrQ== Date: Tue, 12 Aug 2025 16:47:58 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20250812144758.GL29660@pb2> References: <20250812140232.0348F68CC9D@ffbox0-bg.ffmpeg.org> MIME-Version: 1.0 In-Reply-To: X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeehieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeffledtfeevfeffheeuuefhtdejieelueeftdeitdfgheetgefffeefteekffdthfenucffohhmrghinhepfhhfmhhpvghgrdhorhhgnecukfhppeeguddrieeirdeihedrudejieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeihedrudejiedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225) 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="===============2226543174782884388==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============2226543174782884388== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="UTZdXc3/FB1fCeDC" Content-Disposition: inline --UTZdXc3/FB1fCeDC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 12, 2025 at 04:18:10PM +0200, Nicolas George wrote: > michaelni (HE12025-08-12): > > PR #20225 opened by michaelni > > URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225 > > Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225.patch > >=20 > >=20 > > >From a489870a2b35bf0e5a6a9a12696bceb211e18a35 Mon Sep 17 00:00:00 2001 > > From: Michael Niedermayer > > Date: Mon, 11 Aug 2025 20:06:25 +0200 > > Subject: [PATCH 1/2] tools/merge-all-source-plugins: Fix merge_internal= () > > return code > >=20 > > Signed-off-by: Michael Niedermayer > > --- > > tools/merge-all-source-plugins | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > >=20 > > diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-pl= ugins > > index cd030cdabe..27f64f690c 100755 > > --- a/tools/merge-all-source-plugins > > +++ b/tools/merge-all-source-plugins > > @@ -2,8 +2,11 @@ > > =20 > > #If a version is set then we only try merging a source plugin with mat= ching version as a generic one could change the ABI to master HEAD > > merge_internal(){ # $1=3Drepository, $2=3Drefspec > > - [ -n "$version" ] && git pull --no-rebase --log --stat --commit --= no-edit $1 sourceplugin-$2-$version > > - [ -z "$version" ] && git pull --no-rebase --log --stat --commit --= no-edit $1 sourceplugin-$2 > > + if [ -n "$version" ] ; then > > + git pull --no-rebase --log --stat --commit --no-edit $1 sourc= eplugin-$2-$version > > + else > > + git pull --no-rebase --log --stat --commit --no-edit $1 sourc= eplugin-$2 > > + fi >=20 > Duplicated code in both the old and the new version. Better: >=20 > branch=3Dsourceplugin-$2-$version > if [ -n "$version" ] ; then > branch=3D"$branch-$version" > fi > git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch" >=20 > Also, better not forget quoting shell variables, even if you trust the > caller to avoid dangerous characters. changed thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In fact, the RIAA has been known to suggest that students drop out of college or go to community college in order to be able to afford settlements. -- The RIAA --UTZdXc3/FB1fCeDC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaJtUGwAKCRBhHseHBAsP q6lAAJ95erfmLTjtMYi5UGX0Wzw0IE02mgCdG8npCy/HAO1An4dZ0g2Pelxzlvs= =pO/e -----END PGP SIGNATURE----- --UTZdXc3/FB1fCeDC-- --===============2226543174782884388== 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". --===============2226543174782884388==--