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 1FD854BA7A for ; Sat, 23 Aug 2025 13:20:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 14490680147; Sat, 23 Aug 2025 16:20:35 +0300 (EEST) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C70A3680241 for ; Sat, 23 Aug 2025 16:20:27 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 029D141C7C for ; Sat, 23 Aug 2025 13:20:26 +0000 (UTC) Date: Sat, 23 Aug 2025 15:20:25 +0200 To: FFmpeg development discussions and patches Message-ID: <20250823132025.GT29660@pb2> References: <20250821113202.GH29660@pb2> MIME-Version: 1.0 In-Reply-To: <20250821113202.GH29660@pb2> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduieeijeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieehrddujeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieehrddujeeipdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [POLL][RFC] Merge vs Cherry pick for integration of changes 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: , From: Michael Niedermayer via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Michael Niedermayer Content-Type: multipart/mixed; boundary="===============0170788143665979842==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0170788143665979842== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7Dt9qEUv0cumkF9A" Content-Disposition: inline --7Dt9qEUv0cumkF9A Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi On Thu, Aug 21, 2025 at 01:32:02PM +0200, Michael Niedermayer via ffmpeg-de= vel wrote: > Hi >=20 > Should we use a Merge or Cherry picks for integrating Pauls work ? >=20 > Following are 2 plans, as we execute either we may run into issues > and of course adapt them as needed. (or even switch) If neither Cherry picking nor Merging is choosen then I will remove my STF proposal about that work before 1. September (unless the deadline is extended). Without that funding, i cannot offer going through individual modules. That means someone else would need to volunteer doing this work to have the "Cherry pick" option in the future. (also consider code divergence with a future funding round) For the "Merge" option, similarly, the loss of STF funding would mean a loss of (funded) "per module" work. "Merge" will stay available from me but with= out per module work. (someone else would have to do per module work, or no per = module work would be done) OTOH with the Integration of pauls code, i will spend more time on FFmpeg in the next 12 months, i would continue doing the fuzzing work as good as i can and i will try to get the 8.1 release done in the next 3 months if peop= le want that. Without the integration of the code, I will likely loose alot of my motivat= ion to contribute. I hope "D" (if its choosen) will stand for Discussion and not Decline or ev= en eventual Death of FFmpeg. thx --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have never wished to cater to the crowd; for what I know they do not approve, and what they approve I do not know. -- Epicurus --7Dt9qEUv0cumkF9A Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaKnAFgAKCRBhHseHBAsP q7VTAJ0YiEsjqb8IbCESfVtOwwaxaKBv5ACfZMmkxGynMEFeIPQv3hHaQhg9hvI= =2pSZ -----END PGP SIGNATURE----- --7Dt9qEUv0cumkF9A-- --===============0170788143665979842== 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". --===============0170788143665979842==--