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

[Kieran Kunhya]

On Thu, 21 Aug 2025, 01:32 Michael Niedermayer via ffmpeg-devel, <
ffmpeg-devel at ffmpeg.org> 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.
>
> We currently have a point on the wiki for STF 2025 that would fund each
> integrated module with 900€.
> 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
>

D

For the record, Paul had a note saying changes are under GPL. As I
understand you are ignoring legal advice saying this is a valid statement.

Can you confirm the legal advice you were given and that you are ignoring
it?

Kieran

>