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

[Michael Niedermayer via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

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

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)

If neither Cherry picking nor Merging is choosen then I will remove
my STF proposal about that work before 1. September (unless the deadline
is extended).

Without that funding, i cannot offer going through individual modules.
That means someone else would need to volunteer doing this work
to have the "Cherry pick" option in the future.
(also consider code divergence with a future funding round)

For the "Merge" option, similarly, the loss of STF funding would mean a loss
of (funded) "per module" work. "Merge" will stay available from me but without
per module work. (someone else would have to do per module work, or no per module
work would be done)

OTOH with the Integration of pauls code, i will spend more time on FFmpeg
in the next 12 months, i would continue doing the fuzzing work as good as i
can and i will try to get the 8.1 release done in the next 3 months if people
want that.
Without the integration of the code, I will likely loose alot of my motivation
to contribute.

I hope "D" (if its choosen) will stand for Discussion and not Decline or even
eventual Death of FFmpeg.

thx

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus

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