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

* [FFmpeg-devel] [POLL][RFC] Merge vs Cherry pick for integration of changes
@ 2025-08-21 11:32 Michael Niedermayer via ffmpeg-devel
  2025-08-21 16:56 ` Kieran Kunhya via ffmpeg-devel
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer via ffmpeg-devel @ 2025-08-21 11:32 UTC (permalink / raw)
  To: FFmpeg development discussions and patches; +Cc: Michael Niedermayer

[-- Attachment #1.1: Type: text/plain, Size: 2314 bytes --]

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

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Some Animals are More Equal Than Others. - George Orwell's book Animal Farm

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 4+ messages in thread