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 2C6DC4D43D for ; Sun, 1 Jun 2025 15:22:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 107FC68D30E; Sun, 1 Jun 2025 18:22:31 +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 B39C768CC56 for ; Sun, 1 Jun 2025 18:22:24 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D120C43B46 for ; Sun, 1 Jun 2025 15:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1748791344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=HopmOO3OY4O4vZkwxDLNrajlBH+YbywPJeEUD+KYOBQ=; b=N1J0HIVPyUnji5wcn/gNFUN38uIIyImfh3kkPv28CNLy6p6sn7uEIQ/+2g/MqbuVWbC6rZ GHZLCN+Xm7QzXROhp6VGR11vb3UqNlLI1T9Mg5AHtDR5FqI8wKmj5EHyGAZdjeSb/dIWkH BNzVTNxPDELAroyrsMFgGeWDNHZFHJhQiOZcHL51BopsKsA2nEGlfFXUPY7VxXSUyZQ5s+ S+g8Nu6+wKqfOfqI89rdOVG9i3PpxBTtUqfzo6W1r/NAccgb+vx8a9BqH5E6ODA0PU9S6k jHJ/i3c6BIYzsXF1PiZe4HMkiHDi0Pou8ufUswLMxdw8tJIKigJ0z4VpUhRWTQ== Date: Sun, 1 Jun 2025 17:22:22 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20250601152222.GU29660@pb2> MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdefhedugeculddtuddrgeefvddrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnegfrhhlucfvnfffucdlfedtmdenucfjughrpeffhffvuffkgggtugesghdtreertddtvdenucfhrhhomhepofhitghhrggvlhcupfhivgguvghrmhgrhigvrhcuoehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgeqnecuggftrfgrthhtvghrnhepieefgeevgfdvgeeludegheelhfegffdvgefgtdegveegudelveeiueelieetveffnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [RFC] Cherry picks vs merges 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="===============1150494751832320989==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============1150494751832320989== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vDKrKDXdkKg1HlpX" Content-Disposition: inline --vDKrKDXdkKg1HlpX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all almpeg is now merged upto 1 months ago. (and since last merge it contains bits of AGPL code) The question now is, how does the community want to proceed from here? I think there are mainly 2 options 1. People review almpeg/master, fix any issues they want fixed, change anyt= hing they want changed and then we just "git merge" it. 2a. People cherry pick individual commits one by one and or diff between almpeg and mainline and post these for review like any other patches 2b. People review these patches 2c. patches or almpeg is updated according to reviews and this is repeated until everyone is happy 2d. patches are applied to mainline and the diff between almpeg and mainline decreases. (so one can always consider diff hunks to be things that need to be worked on either update almpeg to mainline or mainline to almpeg) I do intend to post a small set of patches from almpeg so we can see how the cherry picking style method would work. How merging would look you can basically see in almpeg/master already Into which of the 2 options would you be more eager to put your time? (I think it really matters where you want to put your time not so much where you want others to put their time ...) PS: also theres STF, is someone interrested in doing more patch reviews whe= n it is payed ? If so, say something, i think we either way need more reviewers = and STF would be one way to incentivize more reviewing PS2: yes we can vote about cherry pick vs merge if people want but i suspect its more a question about will and time than vote. thx --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What is kyc? Its a tool that makes you give out your real ID, while crimina= ls give out a forged ID card. --vDKrKDXdkKg1HlpX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaDxwKwAKCRBhHseHBAsP q5gvAJ4vilQUORPeuVYwc9UU5KMYF/UpuQCeIvAIT0R2JcgelBeOQQZI1/i6fQw= =nrCy -----END PGP SIGNATURE----- --vDKrKDXdkKg1HlpX-- --===============1150494751832320989== 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". --===============1150494751832320989==--