[FFmpeg-devel] [POLL][RFC] Merge vs Cherry pick for integration of changes

[Michael Niedermayer]

Hi all

On Sun, Aug 24, 2025 at 12:59:29PM +0200, Michael Niedermayer via ffmpeg-devel 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)
> > 
> >     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.
> 
> "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íng the oppinions of
several developers. It seems most people prefer integrating the modules under
GPLv3+ and that is easier with cherry picks than a true merge
Of course as before iam perfectly happy with "M"

thx

[..]

-- 
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250825/87897c1a/attachment.sig>