Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Michael Niedermayer
On Wed, Jun 04, 2025 at 01:42:42PM -0700, Baptiste Coudurier wrote: > > > On Jun 4, 2025, at 11:06 AM, Tomas Härdin wrote: > > > > sön 2025-06-01 klockan 21:23 +0200 skrev Michael Niedermayer: > >> And the "explicit license notice" you refer to is this: > >> > >> "All Librempeg modifications, a

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Baptiste Coudurier
> On Jun 4, 2025, at 11:06 AM, Tomas Härdin wrote: > > sön 2025-06-01 klockan 21:23 +0200 skrev Michael Niedermayer: >> And the "explicit license notice" you refer to is this: >> >> "All Librempeg modifications, and any new files not available in >> FFmpeg, are licensed under GPL v2, >> unless

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Tomas Härdin
sön 2025-06-01 klockan 21:23 +0200 skrev Michael Niedermayer: > And the "explicit license notice" you refer to is this: > > "All Librempeg modifications, and any new files not available in > FFmpeg, are licensed under GPL v2, >  unless stated otherwise." > > And it IS stated otherwise in these fi

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Rémi Denis-Courmont
Le tiistaina 3. kesäkuuta 2025, 16.09.48 Itä-Euroopan kesäaika Michael Niedermayer a écrit : > > So, which of his "modifications" (commits) have an explicit statement > > "otherwise"? > I see this: > > commit 3ff6d301b27965b23ae5cf5211920ee16d6671c2 > Author: Anton Khirnov > Date: Thu Oct 24 0

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread compn
On Mon, 2 Jun 2025 08:23:41 +, softworkz . wrote: > What would happen if we merge everything? > > - We would gain 2.5 years of work > - He will change all license headers > - The doors will be closed for all future there is no door closed forever. gplv2 code is still open source and ffmpeg h

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Kieran Kunhya via ffmpeg-devel
> FFlabs depends on FFmpeg so its interrests in terms of FFmpeg complying > to all laws should be aligned here Interesting, so the person that complains about FFlabs having too much corporate control over FFmpeg is now ok to assume FFlabs legal opinion "align[ing]" with FFmpeg. Kieran __

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-04 Thread Michael Niedermayer
Hi On Tue, Jun 03, 2025 at 11:38:11PM +0100, Kieran Kunhya via ffmpeg-devel wrote: > > > > all members of fflabs where aware of it as i asked about the license > > situation it in the private > > fflabs IRC channel. I asked there because fflabs/jb has a lawyer > > > > Do you understand that the l

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-03 Thread Kieran Kunhya via ffmpeg-devel
> > all members of fflabs where aware of it as i asked about the license > situation it in the private > fflabs IRC channel. I asked there because fflabs/jb has a lawyer > Do you understand that the lawyer of FFlabs represents the interests of FFlabs and does not represent the interests of FFmpeg?

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-03 Thread Michael Niedermayer
Hi Remi On Mon, Jun 02, 2025 at 06:38:54PM +0300, Rémi Denis-Courmont wrote: [...] > >And the "explicit license notice" you refer to is this: > > > >"All Librempeg modifications, and any new files not available in FFmpeg, are > >licensed under GPL v2, > > unless stated otherwise." > > So, which

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread Kieran Kunhya via ffmpeg-devel
> > > - The doors will be closed for all future > > As i predicted elsewhere privately, I do not belive Paul will return > unless his fork fails. > The more successfull his fork is, the less likely it is that he will > return > > Also its like 18 months since paul forked and the way he speaks reall

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread Rémi Denis-Courmont
Hi, >If paul wants them to be GPL he can change these headers at any time. I agree with your implication that Paul *should* have modified the license headers either globally or as he modified files. But that does not make the top-level license statement moot. >And the "explicit license notice

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread Michael Niedermayer
Hi softworkz On Mon, Jun 02, 2025 at 08:23:41AM +, softworkz . wrote: > > > > -Original Message- > > From: ffmpeg-devel On Behalf Of Marton > > Balint > > Sent: Montag, 2. Juni 2025 09:41 > > To: FFmpeg development discussions and patches

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread Michael Niedermayer
Hi all On Sun, Jun 01, 2025 at 11:31:49PM +0200, Michael Niedermayer wrote: > Hi James > > On Sun, Jun 01, 2025 at 05:01:09PM -0300, James Almer wrote: > > On 6/1/2025 4:23 PM, Michael Niedermayer wrote: > > > Hi James > > > > > > On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: > >

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread softworkz .
> -Original Message- > From: ffmpeg-devel On Behalf Of Marton > Balint > Sent: Montag, 2. Juni 2025 09:41 > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [RFC] Cherry picks vs merges > > > > On Sun, 1 Jun 2025, James Alm

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-02 Thread Marton Balint
On Sun, 1 Jun 2025, James Almer wrote: On 6/1/2025 4:23 PM, Michael Niedermayer wrote: Hi James On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: On 6/1/2025 12:22 PM, Michael Niedermayer wrote: Hi all almpeg is now merged upto 1 months ago. (and since last merge it cont

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Vittorio Giovara
On Sun, Jun 1, 2025 at 5:32 PM Michael Niedermayer wrote: > > I'm not against merging his changes, and i apologize if what i said > before > > sounded like an accusation, but the way i want this to go forward is with > > him being ok with it, and not us trying to find a way to workaround what > w

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Baptiste Coudurier
> On Jun 1, 2025, at 2:55 PM, Kieran Kunhya via ffmpeg-devel > wrote: > > On Sun, 1 Jun 2025, 20:23 Michael Niedermayer, > wrote: > >> Hi James >> >> On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: >>> On 6/1/2025 12:22 PM, Michael Niedermayer wrote: Hi all almpe

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Kieran Kunhya via ffmpeg-devel
On Sun, 1 Jun 2025, 20:23 Michael Niedermayer, wrote: > Hi James > > On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: > > On 6/1/2025 12:22 PM, Michael Niedermayer wrote: > > > Hi all > > > > > > almpeg is now merged upto 1 months ago. (and since last merge it > contains > > > bits of

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Michael Niedermayer
Hi James On Sun, Jun 01, 2025 at 05:01:09PM -0300, James Almer wrote: > On 6/1/2025 4:23 PM, Michael Niedermayer wrote: > > Hi James > > > > On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: > > > On 6/1/2025 12:22 PM, Michael Niedermayer wrote: > > > > Hi all > > > > > > > > almpeg i

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread James Almer
On 6/1/2025 4:23 PM, Michael Niedermayer wrote: Hi James On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: On 6/1/2025 12:22 PM, Michael Niedermayer wrote: Hi all almpeg is now merged upto 1 months ago. (and since last merge it contains bits of AGPL code) The question now is, how

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread compn
On Sun, 1 Jun 2025 21:23:20 +0200, Michael Niedermayer wrote: > Hi James > > On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: > > On 6/1/2025 12:22 PM, Michael Niedermayer wrote: > > > Hi all > > > > > > almpeg is now merged upto 1 months ago. (and since last merge it contains > >

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Michael Niedermayer
Hi James On Sun, Jun 01, 2025 at 02:27:37PM -0300, James Almer wrote: > On 6/1/2025 12:22 PM, Michael Niedermayer wrote: > > Hi all > > > > almpeg is now merged upto 1 months ago. (and since last merge it contains > > bits of AGPL code) > > > > The question now is, how does the community want to

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread James Almer
On 6/1/2025 12:22 PM, Michael Niedermayer wrote: Hi all almpeg is now merged upto 1 months ago. (and since last merge it contains bits of AGPL code) The question now is, how does the community want to proceed from here? Full stop. Not only you're trying to bypass explicit a license notice on

Re: [FFmpeg-devel] [RFC] Cherry picks vs merges

2025-06-01 Thread Kieran Kunhya via ffmpeg-devel
On Sun, 1 Jun 2025, 16:22 Michael Niedermayer, wrote: > Hi all > > almpeg is now merged upto 1 months ago. (and since last merge it contains > bits of AGPL code) > > The question now is, how does the community want to proceed from here? > > I think there are mainly 2 options > > 1. People review