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

[Michael Niedermayer]

Hi

On Thu, Aug 21, 2025 at 01:32:02PM +0200, Michael Niedermayer via ffmpeg-devel wrote:
> 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.

"M", (probably) less work than "C" and iam lazy. But 100% happy to change my vote to
     "C", if thats what the majority preferrs

thx

[...]

-- 
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 government.
-------------- 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/20250824/e5d228c2/attachment.sig>