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 2B72D4B11F for ; Thu, 21 Aug 2025 11:32:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6381168D654; Thu, 21 Aug 2025 14:32:10 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3CACB68BDD6 for ; Thu, 21 Aug 2025 14:32:04 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5B62943A1A for ; Thu, 21 Aug 2025 11:32:03 +0000 (UTC) Date: Thu, 21 Aug 2025 13:32:02 +0200 To: FFmpeg development discussions and patches Message-ID: <20250821113202.GH29660@pb2> MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdduieduuddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfggtggusehgtderredttdelnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpefhfedtudeuleejgfduteejgeekfedvhfefjeefteejhfeghfegheeikeeukeeftdenucfkphepgedurdeiiedrieehrddujeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieehrddujeeipdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: [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="===============2034100121571007981==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============2034100121571007981== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GeTHJtBuw3iN4+3e" Content-Disposition: inline --GeTHJtBuw3iN4+3e Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Should we use a Merge or Cherry picks for integrating Pauls work ? Following are 2 plans, as we execute either we may run into issues and of course adapt them as needed. (or even switch) Option M: This would be a merge of pauls last revission before files where switched to GPL and the command line tool to AGPL It would include all changes (except what is intentionally skiped) (This will look similar to how almpeg looks now) 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. Option C: Individual Modules (Codecs, Filters, Demuxers) would be submitted as patch(sets) This would include only the picked changes. Changes noone picks and posts would be missing. 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. M would likely integrate more changes, C less changes. C may be more work. We currently have a point on the wiki for STF 2025 that would fund each integrated module with 900=A4. That way, whoever adds fate tests, makes changes the community wants in a review, fixes bugs found by tests or review, could be funded. It is possible that teh community adjusts the exact STF task / work / ... before its deadline. I think many people have already thought about the merge vs cherry pick question. (it came up previously on the ML and in the GA) So maybe we can just vote on it now over the next 8 days. Or if people want more discussion first, we can do that too. We will see based on peoples replies. Maybe use the first day to think and sleep over it or a quick discussion and then vote in the next 7 days. If you want to vote, please simply reply with "M" or "C" (and of course any details, why you think thats the better option, if you want to add details) Otherwise reply with "D" for "more Discussion" and details about what you want to say/discuss. thx --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Some Animals are More Equal Than Others. - George Orwell's book Animal Farm --GeTHJtBuw3iN4+3e Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaKcDrgAKCRBhHseHBAsP qyvDAJ9driCYGIXJRrxISuWRVNsas2qoWgCgmDJrqbz3sCs7+FTyaiZKGY92T8s= =RQn8 -----END PGP SIGNATURE----- --GeTHJtBuw3iN4+3e-- --===============2034100121571007981== 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". --===============2034100121571007981==--