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 787DB4BCB9 for ; Mon, 25 Aug 2025 12:04:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 84ADF6802BD; Mon, 25 Aug 2025 15:04:25 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6243D6802BD for ; Mon, 25 Aug 2025 15:04:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 913BD1FCE3 for ; Mon, 25 Aug 2025 12:04:17 +0000 (UTC) Date: Mon, 25 Aug 2025 14:04:15 +0200 To: FFmpeg development discussions and patches Message-ID: <20250825120415.GE29660@pb2> References: <20250821113202.GH29660@pb2> <20250824105929.GA29660@pb2> MIME-Version: 1.0 In-Reply-To: <20250824105929.GA29660@pb2> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddujedvfeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddunecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpedutedvhfduuedugedufefghefhvedvgffgffekhfdvgfdvtefftdejkeehteefheenucfkphepgedurdeiiedrieehrddujeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieehrddujeeipdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg 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="===============6213519484891364135==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6213519484891364135== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Z7JpvZ9qPxwQqOVo" Content-Disposition: inline --Z7JpvZ9qPxwQqOVo Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all On Sun, Aug 24, 2025 at 12:59:29PM +0200, Michael Niedermayer via ffmpeg-de= vel wrote: [...] > > Option M: > > This would be a merge of pauls last revission before files where > > switched to GPL and the command line tool to AGPL [...] > > 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 wo= rk. >=20 > "M", (probably) less work than "C" and iam lazy. But 100% happy to change= my vote to > "C", if thats what the majority preferrs Id like to change my choice from "M" to "C" after hearn=EDng the oppinions = of several developers. It seems most people prefer integrating the modules und= er GPLv3+ and that is easier with cherry picks than a true merge Of course as before iam perfectly happy with "M" thx [..] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Modern terrorism, a quick summary: Need oil, start war with country that has oil, kill hundread thousand in war. Let country fall into chaos, be surprised about raise of fundamantalists. Drop more bombs, kill more people, be surprised about them taking revenge and drop even more bombs and strip your own citizens of their rights and freedoms. to be continued --Z7JpvZ9qPxwQqOVo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaKxRPwAKCRBhHseHBAsP q7ocAKCYDxE8sUeiPl/DeZ0tdPPwBZsi1QCePr2izwZWfZWYRCdpRTapJU8p690= =lUfh -----END PGP SIGNATURE----- --Z7JpvZ9qPxwQqOVo-- --===============6213519484891364135== 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". --===============6213519484891364135==--