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 328424BB09 for ; Sun, 24 Aug 2025 10:59:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3BFFE68E6F7; Sun, 24 Aug 2025 13:59:37 +0300 (EEST) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C975068E6DB for ; Sun, 24 Aug 2025 13:59:30 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0CDDD430BB for ; Sun, 24 Aug 2025 10:59:29 +0000 (UTC) Date: Sun, 24 Aug 2025 12:59:29 +0200 To: FFmpeg development discussions and patches Message-ID: <20250824105929.GA29660@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: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduieelfeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieehrddujeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieehrddujeeipdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg 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="===============3057379971417143553==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============3057379971417143553== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3hWwbEu3KKsnZsar" Content-Disposition: inline --3hWwbEu3KKsnZsar 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) >=20 > Option M: > This would be a merge of pauls last revission before files where > switched to GPL and the command line tool to AGPL >=20 > It would include all changes (except what is intentionally skiped) > (This will look similar to how almpeg looks now) >=20 > Fate tests would be added after the merge where sample media is > publically available on our server. > Reviews of Individual modules can be done after the merge where > people want to do that. >=20 > Option C: > Individual Modules (Codecs, Filters, Demuxers) would be submitted > as patch(sets) >=20 > This would include only the picked changes. Changes noone picks and > posts would be missing. >=20 > Each would go through the review process (some likely with "apply > after timeout"). And during that review fate tests would be added > where public samples are on our server. >=20 > M would likely integrate more changes, C less changes. C may be more work. "M", (probably) less work than "C" and iam lazy. But 100% happy to change m= y vote to "C", if thats what the majority preferrs thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The difference between a dictatorship and a democracy is that every 4 years the population together is allowed to provide 1 bit of input to the governm= ent. --3hWwbEu3KKsnZsar Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaKrwkAAKCRBhHseHBAsP q0dNAJ9MW8lJe3P5HAAJFXa5FnD/vImgKwCghS2Xwg+5FoB1104nSD94uzvKjU0= =56bn -----END PGP SIGNATURE----- --3hWwbEu3KKsnZsar-- --===============3057379971417143553== 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". --===============3057379971417143553==--